| Message ID | 1417357142-14307-17-git-send-email-thomas.petazzoni@free-electrons.com |
|---|---|
| State | Accepted |
| Headers | show |
Thomas, All, On 2014-11-30 15:18 +0100, Thomas Petazzoni spake thusly: > Also move back the NFS_UTILS_INSTALL_FIXUP hook registration right > after the hook definition. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > --- > package/nfs-utils/nfs-utils.mk | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk > index 522e790..aef051c 100644 > --- a/package/nfs-utils/nfs-utils.mk > +++ b/package/nfs-utils/nfs-utils.mk > @@ -35,17 +35,20 @@ NFS_UTILS_CONF_OPTS += --disable-tirpc > endif > > define NFS_UTILS_INSTALL_FIXUP > + rm -f $(NFS_UTILS_TARGETS_) > +endef > + > +NFS_UTILS_POST_INSTALL_TARGET_HOOKS += NFS_UTILS_INSTALL_FIXUP > + > +define NFS_UTILS_INSTALL_INIT_SYSV > $(INSTALL) -m 0755 package/nfs-utils/S60nfs \ Missing -D option. Regards, Yann E. MORIN. > $(TARGET_DIR)/etc/init.d/S60nfs > - rm -f $(NFS_UTILS_TARGETS_) > endef > > define NFS_UTILS_REMOVE_NFSIOSTAT > rm -f $(TARGET_DIR)/usr/sbin/nfsiostat > endef > > -NFS_UTILS_POST_INSTALL_TARGET_HOOKS += NFS_UTILS_INSTALL_FIXUP > - > # nfsiostat is interpreted python, so remove it unless it's in the target > NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT) > > -- > 2.1.0 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: > Also move back the NFS_UTILS_INSTALL_FIXUP hook registration right > after the hook definition. > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Committed with the -D option added as noted by Yann, thanks.
diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 522e790..aef051c 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -35,17 +35,20 @@ NFS_UTILS_CONF_OPTS += --disable-tirpc endif define NFS_UTILS_INSTALL_FIXUP + rm -f $(NFS_UTILS_TARGETS_) +endef + +NFS_UTILS_POST_INSTALL_TARGET_HOOKS += NFS_UTILS_INSTALL_FIXUP + +define NFS_UTILS_INSTALL_INIT_SYSV $(INSTALL) -m 0755 package/nfs-utils/S60nfs \ $(TARGET_DIR)/etc/init.d/S60nfs - rm -f $(NFS_UTILS_TARGETS_) endef define NFS_UTILS_REMOVE_NFSIOSTAT rm -f $(TARGET_DIR)/usr/sbin/nfsiostat endef -NFS_UTILS_POST_INSTALL_TARGET_HOOKS += NFS_UTILS_INSTALL_FIXUP - # nfsiostat is interpreted python, so remove it unless it's in the target NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT)
Also move back the NFS_UTILS_INSTALL_FIXUP hook registration right after the hook definition. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/nfs-utils/nfs-utils.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)