| Message ID | 1456437341-19025-2-git-send-email-gabe@hashrabbit.co |
|---|---|
| State | Accepted |
| Headers | show |
Hi Gabe, I'm not going to review all of the series yet, just a few of them. The patches which are pretty independent (like this one) you can resend individually. Only when you resend the later ones you need to send the entire series. On 02/25/16 22:55, Gabe Evans wrote: > systemd v228 requires lz4 >= 125 > > Signed-off-by: Gabe Evans <gabe@hashrabbit.co> > --- > package/lz4/lz4.hash | 2 ++ > package/lz4/lz4.mk | 19 ++++++++++++------- > 2 files changed, 14 insertions(+), 7 deletions(-) > create mode 100644 package/lz4/lz4.hash > > diff --git a/package/lz4/lz4.hash b/package/lz4/lz4.hash > new file mode 100644 > index 0000000..1281284 > --- /dev/null > +++ b/package/lz4/lz4.hash > @@ -0,0 +1,2 @@ > +# sha256 locally computed > +sha256 9d4d00614d6b9dec3114b33d1224b6262b99ace24434c53487a0c8fd0b18cfed lz4-r131.tar.gz > diff --git a/package/lz4/lz4.mk b/package/lz4/lz4.mk > index 38e10d8..dbb2221 100644 > --- a/package/lz4/lz4.mk > +++ b/package/lz4/lz4.mk > @@ -4,37 +4,42 @@ > # > ################################################################################ > > -LZ4_VERSION = r123 > +LZ4_VERSION = r131 > LZ4_SITE = $(call github,Cyan4973,lz4,$(LZ4_VERSION)) > LZ4_INSTALL_STAGING = YES > LZ4_LICENSE = BSD-2c > LZ4_LICENSE_FILES = LICENSE > > +LZ4_MAKE_OPTS = PREFIX=/usr I'd prefer to have LZ4_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) PREFIX=/usr HOST_LZ4_MAKE_OPTS = $(HOST_CONFIGURE_OPTS) PREFIX=/usr However, is the PREFIX useful during the build? If it's only needed at install time, then I would just pass it there, like we do with DESTDIR already. Regards, Arnout > + > ifeq ($(BR2_STATIC_LIBS),y) > define LZ4_DISABLE_SHARED > - $(SED) '/SHARED/d' $(@D)/Makefile > + $(SED) '/SHARED/d' $(@D)/lib/Makefile > endef > LZ4_POST_PATCH_HOOKS += LZ4_DISABLE_SHARED > endif > > define HOST_LZ4_BUILD_CMDS > - $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) > + $(MAKE) $(HOST_CONFIGURE_OPTS) $(LZ4_MAKE_OPTS) -C $(@D) > endef > > define HOST_LZ4_INSTALL_CMDS > - $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) install DESTDIR=$(HOST_DIR) > + $(MAKE) $(HOST_CONFIGURE_OPTS) $(LZ4_MAKE_OPTS) DESTDIR=$(HOST_DIR) \ > + install -C $(@D) > endef > > define LZ4_BUILD_CMDS > - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) liblz4 > + $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LZ4_MAKE_OPTS) -C $(@D)/lib > endef > > define LZ4_INSTALL_STAGING_CMDS > - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) install DESTDIR=$(STAGING_DIR) > + $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LZ4_MAKE_OPTS) DESTDIR=$(STAGING_DIR) \ > + install -C $(@D) > endef > > define LZ4_INSTALL_TARGET_CMDS > - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) install DESTDIR=$(TARGET_DIR) > + $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LZ4_MAKE_OPTS) DESTDIR=$(TARGET_DIR) \ > + install -C $(@D)/lib > endef > > $(eval $(generic-package)) >
Hi Arnout, On Thu, Feb 25, 2016 at 3:44 PM Arnout Vandecappelle <arnout@mind.be> wrote: > Hi Gabe, > > I'm not going to review all of the series yet, just a few of them. The > patches > which are pretty independent (like this one) you can resend individually. > Only > when you resend the later ones you need to send the entire series. > Thanks for having a look. I wasn't sure what to do with this one since it's needed for patch #4 (add --enable/disable-lz4) to work. > > On 02/25/16 22:55, Gabe Evans wrote: > > systemd v228 requires lz4 >= 125 > > > > Signed-off-by: Gabe Evans <gabe@hashrabbit.co> > > --- > > package/lz4/lz4.hash | 2 ++ > > package/lz4/lz4.mk | 19 ++++++++++++------- > > 2 files changed, 14 insertions(+), 7 deletions(-) > > create mode 100644 package/lz4/lz4.hash > > > > diff --git a/package/lz4/lz4.hash b/package/lz4/lz4.hash > > new file mode 100644 > > index 0000000..1281284 > > --- /dev/null > > +++ b/package/lz4/lz4.hash > > @@ -0,0 +1,2 @@ > > +# sha256 locally computed > > +sha256 > 9d4d00614d6b9dec3114b33d1224b6262b99ace24434c53487a0c8fd0b18cfed > lz4-r131.tar.gz > > diff --git a/package/lz4/lz4.mk b/package/lz4/lz4.mk > > index 38e10d8..dbb2221 100644 > > --- a/package/lz4/lz4.mk > > +++ b/package/lz4/lz4.mk > > @@ -4,37 +4,42 @@ > > # > > > ################################################################################ > > > > -LZ4_VERSION = r123 > > +LZ4_VERSION = r131 > > LZ4_SITE = $(call github,Cyan4973,lz4,$(LZ4_VERSION)) > > LZ4_INSTALL_STAGING = YES > > LZ4_LICENSE = BSD-2c > > LZ4_LICENSE_FILES = LICENSE > > > > +LZ4_MAKE_OPTS = PREFIX=/usr > > I'd prefer to have > > LZ4_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) PREFIX=/usr > HOST_LZ4_MAKE_OPTS = $(HOST_CONFIGURE_OPTS) PREFIX=/usr > > However, is the PREFIX useful during the build? If it's only needed at > install > time, then I would just pass it there, like we do with DESTDIR already. > I had a second look and PREFIX is only needed at install. I'll fix this. Thanks, Gabe > > > Regards, > Arnout > > > + > > ifeq ($(BR2_STATIC_LIBS),y) > > define LZ4_DISABLE_SHARED > > - $(SED) '/SHARED/d' $(@D)/Makefile > > + $(SED) '/SHARED/d' $(@D)/lib/Makefile > > endef > > LZ4_POST_PATCH_HOOKS += LZ4_DISABLE_SHARED > > endif > > > > define HOST_LZ4_BUILD_CMDS > > - $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) > > + $(MAKE) $(HOST_CONFIGURE_OPTS) $(LZ4_MAKE_OPTS) -C $(@D) > > endef > > > > define HOST_LZ4_INSTALL_CMDS > > - $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) install DESTDIR=$(HOST_DIR) > > + $(MAKE) $(HOST_CONFIGURE_OPTS) $(LZ4_MAKE_OPTS) > DESTDIR=$(HOST_DIR) \ > > + install -C $(@D) > > endef > > > > define LZ4_BUILD_CMDS > > - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) liblz4 > > + $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LZ4_MAKE_OPTS) -C $(@D)/lib > > endef > > > > define LZ4_INSTALL_STAGING_CMDS > > - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) install > DESTDIR=$(STAGING_DIR) > > + $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LZ4_MAKE_OPTS) > DESTDIR=$(STAGING_DIR) \ > > + install -C $(@D) > > endef > > > > define LZ4_INSTALL_TARGET_CMDS > > - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) install > DESTDIR=$(TARGET_DIR) > > + $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LZ4_MAKE_OPTS) > DESTDIR=$(TARGET_DIR) \ > > + install -C $(@D)/lib > > endef > > > > $(eval $(generic-package)) > > > > > -- > Arnout Vandecappelle arnout at mind be > Senior Embedded Software Architect +32-16-286500 > Essensium/Mind http://www.mind.be > G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven > LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle > GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF >
On 02/26/16 00:57, Gabe Evans wrote: > Hi Arnout, > > On Thu, Feb 25, 2016 at 3:44 PM Arnout Vandecappelle <arnout@mind.be > <mailto:arnout@mind.be>> wrote: > > Hi Gabe, > > I'm not going to review all of the series yet, just a few of them. The > patches > which are pretty independent (like this one) you can resend individually. Only > when you resend the later ones you need to send the entire series. > > > Thanks for having a look. I wasn't sure what to do with this one since it's > needed for patch #4 (add --enable/disable-lz4) to work. Right... And will it automatically disable lz4 if the version is too low? Well, it does mean that patch 4 is not applicable to master after all... Regards, Arnout
Dear Gabe Evans, On Thu, 25 Feb 2016 21:55:10 +0000, Gabe Evans wrote: > systemd v228 requires lz4 >= 125 > > Signed-off-by: Gabe Evans <gabe@hashrabbit.co> > --- > package/lz4/lz4.hash | 2 ++ > package/lz4/lz4.mk | 19 ++++++++++++------- > 2 files changed, 14 insertions(+), 7 deletions(-) > create mode 100644 package/lz4/lz4.hash Applied to next with the following change: [Thomas: only pass PREFIX=/usr at install time instead of using LZ4_MAKE_OPTS, and also pass it for the host installation.] As was suggested by Arnout. Thanks! Thomas
diff --git a/package/lz4/lz4.hash b/package/lz4/lz4.hash new file mode 100644 index 0000000..1281284 --- /dev/null +++ b/package/lz4/lz4.hash @@ -0,0 +1,2 @@ +# sha256 locally computed +sha256 9d4d00614d6b9dec3114b33d1224b6262b99ace24434c53487a0c8fd0b18cfed lz4-r131.tar.gz diff --git a/package/lz4/lz4.mk b/package/lz4/lz4.mk index 38e10d8..dbb2221 100644 --- a/package/lz4/lz4.mk +++ b/package/lz4/lz4.mk @@ -4,37 +4,42 @@ # ################################################################################ -LZ4_VERSION = r123 +LZ4_VERSION = r131 LZ4_SITE = $(call github,Cyan4973,lz4,$(LZ4_VERSION)) LZ4_INSTALL_STAGING = YES LZ4_LICENSE = BSD-2c LZ4_LICENSE_FILES = LICENSE +LZ4_MAKE_OPTS = PREFIX=/usr + ifeq ($(BR2_STATIC_LIBS),y) define LZ4_DISABLE_SHARED - $(SED) '/SHARED/d' $(@D)/Makefile + $(SED) '/SHARED/d' $(@D)/lib/Makefile endef LZ4_POST_PATCH_HOOKS += LZ4_DISABLE_SHARED endif define HOST_LZ4_BUILD_CMDS - $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) + $(MAKE) $(HOST_CONFIGURE_OPTS) $(LZ4_MAKE_OPTS) -C $(@D) endef define HOST_LZ4_INSTALL_CMDS - $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) install DESTDIR=$(HOST_DIR) + $(MAKE) $(HOST_CONFIGURE_OPTS) $(LZ4_MAKE_OPTS) DESTDIR=$(HOST_DIR) \ + install -C $(@D) endef define LZ4_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) liblz4 + $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LZ4_MAKE_OPTS) -C $(@D)/lib endef define LZ4_INSTALL_STAGING_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) install DESTDIR=$(STAGING_DIR) + $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LZ4_MAKE_OPTS) DESTDIR=$(STAGING_DIR) \ + install -C $(@D) endef define LZ4_INSTALL_TARGET_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) install DESTDIR=$(TARGET_DIR) + $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LZ4_MAKE_OPTS) DESTDIR=$(TARGET_DIR) \ + install -C $(@D)/lib endef $(eval $(generic-package))
systemd v228 requires lz4 >= 125 Signed-off-by: Gabe Evans <gabe@hashrabbit.co> --- package/lz4/lz4.hash | 2 ++ package/lz4/lz4.mk | 19 ++++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 package/lz4/lz4.hash