| Message ID | 1453401915-7117-1-git-send-email-gustavo@zacarias.com.ar |
|---|---|
| State | Accepted |
| Headers | show |
Gustavo, On Thu, 21 Jan 2016 15:45:15 -0300, Gustavo Zacarias wrote: > -IFUPDOWN_VERSION = 0.8.2 > +IFUPDOWN_VERSION = 0.8.8 > IFUPDOWN_SOURCE = ifupdown_$(IFUPDOWN_VERSION).tar.xz > -IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20151205T042642Z/pool/main/i/ifupdown > +IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20160113T035819Z/pool/main/i/ifupdown > IFUPDOWN_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) > IFUPDOWN_LICENSE = GPLv2+ > IFUPDOWN_LICENSE_FILES = COPYING > @@ -23,4 +23,13 @@ define IFUPDOWN_INSTALL_TARGET_CMDS > $(TARGET_MAKE_ENV) $(MAKE) BASEDIR=$(TARGET_DIR) -C $(@D) install > endef > > +# We need to switch from /bin/ip to /sbin/ip > +IFUPDOWN_DEFN_FILES = can inet inet6 ipx link meta > +define IFUPDOWN_MAKE_IP_IN_SBIN > + for f in $(IFUPDOWN_DEFN_FILES) ; do \ > + $(SED) 's,/bin/ip,/sbin/ip,' $(@D)/$$f.defn ; \ > + done > +endef > +IFUPDOWN_POST_PATCH_HOOKS += IFUPDOWN_MAKE_IP_IN_SBIN For this kind of things, I think my personal preference would be to have a real patch rather than a post patch hook. Peter ? Thomas
On 21/01/16 18:13, Thomas Petazzoni wrote: >> +# We need to switch from /bin/ip to /sbin/ip >> +IFUPDOWN_DEFN_FILES = can inet inet6 ipx link meta >> +define IFUPDOWN_MAKE_IP_IN_SBIN >> + for f in $(IFUPDOWN_DEFN_FILES) ; do \ >> + $(SED) 's,/bin/ip,/sbin/ip,' $(@D)/$$f.defn ; \ >> + done >> +endef >> +IFUPDOWN_POST_PATCH_HOOKS += IFUPDOWN_MAKE_IP_IN_SBIN > > For this kind of things, I think my personal preference would be to > have a real patch rather than a post patch hook. > > Peter ? > > Thomas Hi Thomas. $ grep /bin/ip *.defn|wc -l 56 Patch would be bigger, and maybe not too version-portable. Regards.
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: > Gustavo, > On Thu, 21 Jan 2016 15:45:15 -0300, Gustavo Zacarias wrote: >> -IFUPDOWN_VERSION = 0.8.2 >> +IFUPDOWN_VERSION = 0.8.8 >> IFUPDOWN_SOURCE = ifupdown_$(IFUPDOWN_VERSION).tar.xz >> -IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20151205T042642Z/pool/main/i/ifupdown >> +IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20160113T035819Z/pool/main/i/ifupdown >> IFUPDOWN_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) >> IFUPDOWN_LICENSE = GPLv2+ >> IFUPDOWN_LICENSE_FILES = COPYING >> @@ -23,4 +23,13 @@ define IFUPDOWN_INSTALL_TARGET_CMDS >> $(TARGET_MAKE_ENV) $(MAKE) BASEDIR=$(TARGET_DIR) -C $(@D) install >> endef >> >> +# We need to switch from /bin/ip to /sbin/ip >> +IFUPDOWN_DEFN_FILES = can inet inet6 ipx link meta >> +define IFUPDOWN_MAKE_IP_IN_SBIN >> + for f in $(IFUPDOWN_DEFN_FILES) ; do \ >> + $(SED) 's,/bin/ip,/sbin/ip,' $(@D)/$$f.defn ; \ >> + done >> +endef >> +IFUPDOWN_POST_PATCH_HOOKS += IFUPDOWN_MAKE_IP_IN_SBIN > For this kind of things, I think my personal preference would be to > have a real patch rather than a post patch hook. I also generally dislike the combination of patches AND sed replacements, but like Gustavoz says it's a bit painful to patch as there's so many instances of it. And I guess we won't be able to upstream such as patch as Debian has /bin/ip (and a /sbin/ip symlink) because of bug reports like this: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=134812 And if busybox would change to /bin/ip, a bunch of scripts would probably break, so that's not going to happen either. So I'm not sure what the best option really is :/ Perhaps just the sed.
Dear Gustavo Zacarias, On Thu, 21 Jan 2016 15:45:15 -0300, Gustavo Zacarias wrote: > Also add a kludge switching the explicit invocation of the ip binary > from /bin to /sbin since that's where buildroot installs it. > > Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> > --- > package/ifupdown/ifupdown.hash | 4 ++-- > package/ifupdown/ifupdown.mk | 13 +++++++++++-- > 2 files changed, 13 insertions(+), 4 deletions(-) Applied to next, thanks. Thomas
diff --git a/package/ifupdown/ifupdown.hash b/package/ifupdown/ifupdown.hash index 02dfd2b..c5a4189 100644 --- a/package/ifupdown/ifupdown.hash +++ b/package/ifupdown/ifupdown.hash @@ -1,2 +1,2 @@ -# From http://ftp.de.debian.org/debian/pool/main/i/ifupdown/ifupdown_0.8.2.dsc -sha256 edb08f935fea9bc376c3faa0140c04c7a4d4ef5f22fd280ec4060386a75df10b ifupdown_0.8.2.tar.xz +# From http://ftp.de.debian.org/debian/pool/main/i/ifupdown/ifupdown_0.8.8.dsc +sha256 180edaaa6de99e4e74de7229481edf74361b8e8468462842618a42a952a26c0e ifupdown_0.8.8.tar.xz diff --git a/package/ifupdown/ifupdown.mk b/package/ifupdown/ifupdown.mk index 7fbd003..37aaf5d 100644 --- a/package/ifupdown/ifupdown.mk +++ b/package/ifupdown/ifupdown.mk @@ -4,9 +4,9 @@ # ################################################################################ -IFUPDOWN_VERSION = 0.8.2 +IFUPDOWN_VERSION = 0.8.8 IFUPDOWN_SOURCE = ifupdown_$(IFUPDOWN_VERSION).tar.xz -IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20151205T042642Z/pool/main/i/ifupdown +IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20160113T035819Z/pool/main/i/ifupdown IFUPDOWN_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) IFUPDOWN_LICENSE = GPLv2+ IFUPDOWN_LICENSE_FILES = COPYING @@ -23,4 +23,13 @@ define IFUPDOWN_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) BASEDIR=$(TARGET_DIR) -C $(@D) install endef +# We need to switch from /bin/ip to /sbin/ip +IFUPDOWN_DEFN_FILES = can inet inet6 ipx link meta +define IFUPDOWN_MAKE_IP_IN_SBIN + for f in $(IFUPDOWN_DEFN_FILES) ; do \ + $(SED) 's,/bin/ip,/sbin/ip,' $(@D)/$$f.defn ; \ + done +endef +IFUPDOWN_POST_PATCH_HOOKS += IFUPDOWN_MAKE_IP_IN_SBIN + $(eval $(generic-package))
Also add a kludge switching the explicit invocation of the ip binary from /bin to /sbin since that's where buildroot installs it. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/ifupdown/ifupdown.hash | 4 ++-- package/ifupdown/ifupdown.mk | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-)