Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Set proper dependency for string replacement targets 

A lot of string replacement target don't have dependency or incorrect
dependency. We setup proper dependency by pattern rules.

Signed-off-by: Chunwei Chen <david.chen@osnexus.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #4908
This commit is contained in:
Chunwei Chen 2016-07-29 16:35:33 -07:00 committed by Brian Behlendorf
parent b64e02e580
commit 5b1bc1a1d8
6 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/dracut/02zfsexpandknowledge/Makefile.am
View File

@ -5,7 +5,7 @@ pkgdracut_SCRIPTS = \
EXTRA_DIST = \ EXTRA_DIST = \
$(top_srcdir)/contrib/dracut/02zfsexpandknowledge/module-setup.sh.in $(top_srcdir)/contrib/dracut/02zfsexpandknowledge/module-setup.sh.in
$(pkgdracut_SCRIPTS): $(pkgdracut_SCRIPTS):%:%.in
-$(SED) -e 's,@bindir\@,$(bindir),g' \ -$(SED) -e 's,@bindir\@,$(bindir),g' \
-e 's,@sbindir\@,$(sbindir),g' \ -e 's,@sbindir\@,$(sbindir),g' \
-e 's,@datadir\@,$(datadir),g' \ -e 's,@datadir\@,$(datadir),g' \
@ -13,7 +13,7 @@ $(pkgdracut_SCRIPTS):
-e 's,@udevdir\@,$(udevdir),g' \ -e 's,@udevdir\@,$(udevdir),g' \
-e 's,@udevruledir\@,$(udevruledir),g' \ -e 's,@udevruledir\@,$(udevruledir),g' \
-e 's,@sysconfdir\@,$(sysconfdir),g' \ -e 's,@sysconfdir\@,$(sysconfdir),g' \
"$(top_srcdir)/contrib/dracut/02zfsexpandknowledge/$@.in" >'$@' $< >'$@'
clean-local:: clean-local::
-$(RM) $(pkgdracut_SCRIPTS) -$(RM) $(pkgdracut_SCRIPTS)

4
contrib/dracut/90zfs/Makefile.am
View File

@ -15,14 +15,14 @@ EXTRA_DIST = \
$(top_srcdir)/contrib/dracut/90zfs/zfs-generator.sh.in \ $(top_srcdir)/contrib/dracut/90zfs/zfs-generator.sh.in \
$(top_srcdir)/contrib/dracut/90zfs/zfs-lib.sh.in $(top_srcdir)/contrib/dracut/90zfs/zfs-lib.sh.in
$(pkgdracut_SCRIPTS): $(pkgdracut_SCRIPTS):%:%.in
-$(SED) -e 's,@bindir\@,$(bindir),g' \ -$(SED) -e 's,@bindir\@,$(bindir),g' \
-e 's,@sbindir\@,$(sbindir),g' \ -e 's,@sbindir\@,$(sbindir),g' \
-e 's,@udevdir\@,$(udevdir),g' \ -e 's,@udevdir\@,$(udevdir),g' \
-e 's,@udevruledir\@,$(udevruledir),g' \ -e 's,@udevruledir\@,$(udevruledir),g' \
-e 's,@sysconfdir\@,$(sysconfdir),g' \ -e 's,@sysconfdir\@,$(sysconfdir),g' \
-e 's,@systemdunitdir\@,$(systemdunitdir),g' \ -e 's,@systemdunitdir\@,$(systemdunitdir),g' \
"$(top_srcdir)/contrib/dracut/90zfs/$@.in" >'$@' $< >'$@'
distclean-local:: distclean-local::
-$(RM) $(pkgdracut_SCRIPTS) -$(RM) $(pkgdracut_SCRIPTS)

4
etc/init.d/Makefile.am
View File

@ -15,7 +15,7 @@ EXTRA_DIST = \
$(top_srcdir)/etc/init.d/zfs-zed.in \ $(top_srcdir)/etc/init.d/zfs-zed.in \
$(top_srcdir)/etc/init.d/zfs.in $(top_srcdir)/etc/init.d/zfs.in
$(init_SCRIPTS) $(initconf_SCRIPTS) $(initcommon_SCRIPTS): $(EXTRA_DIST) $(init_SCRIPTS) $(initconf_SCRIPTS) $(initcommon_SCRIPTS):%:%.in
-(if [ -e /etc/debian_version ]; then \ -(if [ -e /etc/debian_version ]; then \
NFS_SRV=nfs-kernel-server; \ NFS_SRV=nfs-kernel-server; \
else \ else \
@ -36,7 +36,7 @@ $(init_SCRIPTS) $(initconf_SCRIPTS) $(initcommon_SCRIPTS): $(EXTRA_DIST)
-e 's,@runstatedir\@,$(runstatedir),g' \ -e 's,@runstatedir\@,$(runstatedir),g' \
-e "s,@SHELL\@,$$SHELL,g" \ -e "s,@SHELL\@,$$SHELL,g" \
-e "s,@NFS_SRV\@,$$NFS_SRV,g" \ -e "s,@NFS_SRV\@,$$NFS_SRV,g" \
"$(top_srcdir)/etc/init.d/$@.in" >'$@'; \ $< >'$@'; \
[ '$@' = 'zfs-functions' -o '$@' = 'zfs' ] || \ [ '$@' = 'zfs-functions' -o '$@' = 'zfs' ] || \
chmod +x '$@') chmod +x '$@')

4
etc/modules-load.d/Makefile.am
View File

@ -4,10 +4,10 @@ modulesload_DATA = \
EXTRA_DIST = \ EXTRA_DIST = \
$(top_srcdir)/etc/modules-load.d/zfs.conf.in $(top_srcdir)/etc/modules-load.d/zfs.conf.in
$(modulesload_DATA): $(modulesload_DATA):%:%.in
-$(SED) \ -$(SED) \
-e '' \ -e '' \
"$(top_srcdir)/etc/modules-load.d/$@.in" >'$@' $< >'$@'
distclean-local:: distclean-local::
-$(RM) $(modulesload_DATA) -$(RM) $(modulesload_DATA)

11
etc/systemd/system/Makefile.am
View File

@ -18,19 +18,12 @@ EXTRA_DIST = \
$(top_srcdir)/etc/systemd/system/zfs.target.in \ $(top_srcdir)/etc/systemd/system/zfs.target.in \
$(top_srcdir)/etc/systemd/system/50-zfs.preset.in $(top_srcdir)/etc/systemd/system/50-zfs.preset.in
$(systemdunit_DATA): $(systemdunit_DATA) $(systemdpreset_DATA):%:%.in
-$(SED) -e 's,@bindir\@,$(bindir),g' \ -$(SED) -e 's,@bindir\@,$(bindir),g' \
-e 's,@runstatedir\@,$(runstatedir),g' \ -e 's,@runstatedir\@,$(runstatedir),g' \
-e 's,@sbindir\@,$(sbindir),g' \ -e 's,@sbindir\@,$(sbindir),g' \
-e 's,@sysconfdir\@,$(sysconfdir),g' \ -e 's,@sysconfdir\@,$(sysconfdir),g' \
"$(top_srcdir)/etc/systemd/system/$@.in" >'$@' $< >'$@'
$(systemdpreset_DATA):
-$(SED) -e 's,@bindir\@,$(bindir),g' \
-e 's,@runstatedir\@,$(runstatedir),g' \
-e 's,@sbindir\@,$(sbindir),g' \
-e 's,@sysconfdir\@,$(sysconfdir),g' \
"$(top_srcdir)/etc/systemd/system/$@.in" >'$@'
distclean-local:: distclean-local::
-$(RM) $(systemdunit_DATA) $(systemdpreset_DATA) -$(RM) $(systemdunit_DATA) $(systemdpreset_DATA)

4
udev/rules.d/Makefile.am
View File

@ -8,13 +8,13 @@ EXTRA_DIST = \
$(top_srcdir)/udev/rules.d/60-zvol.rules.in \ $(top_srcdir)/udev/rules.d/60-zvol.rules.in \
$(top_srcdir)/udev/rules.d/90-zfs.rules.in $(top_srcdir)/udev/rules.d/90-zfs.rules.in
$(udevrule_DATA): $(udevrule_DATA):%:%.in
-$(SED) -e 's,@bindir\@,$(bindir),g' \ -$(SED) -e 's,@bindir\@,$(bindir),g' \
-e 's,@sbindir\@,$(sbindir),g' \ -e 's,@sbindir\@,$(sbindir),g' \
-e 's,@udevdir\@,$(udevdir),g' \ -e 's,@udevdir\@,$(udevdir),g' \
-e 's,@udevruledir\@,$(udevruledir),g' \ -e 's,@udevruledir\@,$(udevruledir),g' \
-e 's,@sysconfdir\@,$(sysconfdir),g' \ -e 's,@sysconfdir\@,$(sysconfdir),g' \
"$(top_srcdir)/udev/rules.d/$@.in" > '$@' $< > '$@'
distclean-local:: distclean-local::
-$(RM) $(udevrule_DATA) -$(RM) $(udevrule_DATA)