| Message ID | 20230507142319.1001150-1-bernd.kuhls@t-online.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] package/hwdata: install to staging | expand |
Bernd, All, On 2023-05-07 16:23 +0200, Bernd Kuhls spake thusly: > Build-time dependency for the new libdisplay-info package. I've substantially expanded on the commit log, to explain _why_ it needs to be installed to staging. Applied to master, thanks. Regards, Yann E. MORIN. > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > --- > package/hwdata/hwdata.mk | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk > index 755a9c93f1..cbac3a22d4 100644 > --- a/package/hwdata/hwdata.mk > +++ b/package/hwdata/hwdata.mk > @@ -8,6 +8,7 @@ HWDATA_VERSION = 0.369 > HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) > HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 > HWDATA_LICENSE_FILES = COPYING LICENSE > +HWDATA_INSTALL_STAGING = YES > > HWDATA_FILES = \ > $(if $(BR2_PACKAGE_HWDATA_IAB_OUI_TXT),iab.txt oui.txt) \ > @@ -15,7 +16,22 @@ HWDATA_FILES = \ > $(if $(BR2_PACKAGE_HWDATA_PNP_IDS),pnp.ids) \ > $(if $(BR2_PACKAGE_HWDATA_USB_IDS),usb.ids) > > +define HWDATA_CONFIGURE_CMDS > + (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure) > +endef > + > +define HWDATA_BUILD_CMDS > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) hwdata.pc > +endef > + > ifneq ($(strip $(HWDATA_FILES)),) > +define HWDATA_INSTALL_STAGING_CMDS > + $(INSTALL) -D -m 0644 $(@D)/hwdata.pc \ > + $(STAGING_DIR)/usr/lib/pkgconfig/hwdata.pc > + $(INSTALL) -d -m 755 $(STAGING_DIR)/usr/share/hwdata > + $(INSTALL) -m 644 -t $(STAGING_DIR)/usr/share/hwdata \ > + $(addprefix $(@D)/,$(HWDATA_FILES)) > +endef > define HWDATA_INSTALL_TARGET_CMDS > $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/share/hwdata > $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/share/hwdata \ > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes: > Bernd, All, > On 2023-05-07 16:23 +0200, Bernd Kuhls spake thusly: >> Build-time dependency for the new libdisplay-info package. > I've substantially expanded on the commit log, to explain _why_ it needs > to be installed to staging. > Applied to master, thanks. Committed to 2023.02.x and 2023.05.x, thanks.
diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index 755a9c93f1..cbac3a22d4 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -8,6 +8,7 @@ HWDATA_VERSION = 0.369 HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 HWDATA_LICENSE_FILES = COPYING LICENSE +HWDATA_INSTALL_STAGING = YES HWDATA_FILES = \ $(if $(BR2_PACKAGE_HWDATA_IAB_OUI_TXT),iab.txt oui.txt) \ @@ -15,7 +16,22 @@ HWDATA_FILES = \ $(if $(BR2_PACKAGE_HWDATA_PNP_IDS),pnp.ids) \ $(if $(BR2_PACKAGE_HWDATA_USB_IDS),usb.ids) +define HWDATA_CONFIGURE_CMDS + (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure) +endef + +define HWDATA_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) hwdata.pc +endef + ifneq ($(strip $(HWDATA_FILES)),) +define HWDATA_INSTALL_STAGING_CMDS + $(INSTALL) -D -m 0644 $(@D)/hwdata.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/hwdata.pc + $(INSTALL) -d -m 755 $(STAGING_DIR)/usr/share/hwdata + $(INSTALL) -m 644 -t $(STAGING_DIR)/usr/share/hwdata \ + $(addprefix $(@D)/,$(HWDATA_FILES)) +endef define HWDATA_INSTALL_TARGET_CMDS $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/share/hwdata $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/share/hwdata \
Build-time dependency for the new libdisplay-info package. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- package/hwdata/hwdata.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)