For branch pre-package-generation-2011.02
Hi,
Here is the v2 of the preparation branch for package generation. It takes into account remarks from the previous pull request.
This branch is pullable here :
git://git.potipota.net/buildroot pre-package-generation-2011.02
Best regards,
--
Lionel Landwerlin
PATCH 1/16 gdk-pixbuf: fix dependency on libiconv
From: Lionel Landwerlin <[email protected]>
--- package/gdk-pixbuf/Config.in | 1 + package/gdk-pixbuf/gdk-pixbuf.mk | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-)
package/gdk-pixbuf/Config.in +1 -0
@@ -4,6 +4,7 @@ config BR2_PACKAGE_GDK_PIXBUF select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help Gdk-Pixbuf is an image loader and scaler. It uses GObject
package/gdk-pixbuf/gdk-pixbuf.mk +4 -1
@@ -38,7 +38,10 @@ else GDK_PIXBUF_DEPENDENCIES += tiff endif -GDK_PIXBUF_DEPENDENCIES += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config libglib2 libiconv +GDK_PIXBUF_DEPENDENCIES += \ + $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) \ + $(if $(BR2_ENABLE_LOCALE),,libiconv) \ + host-pkg-config libglib2 define GDK_PIXBUF_POST_INSTALL_TWEAKS $(INSTALL) -m 755 package/gdk-pixbuf/S26gdk-pixbuf $(TARGET_DIR)/etc/init.d/
Signature · 1 line
1.7.2.3
PATCH 2/16 dbus: ensure startup script is well installed
In reply to llandwerlin at gmail.comFrom: Lionel Landwerlin <[email protected]>
If /etc/init.d does not exist, we need to be sure that the dbus startup script is installed at the right place.
--- package/dbus/dbus.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
package/dbus/dbus.mk +1 -1
@@ -60,7 +60,7 @@ endif define DBUS_INSTALL_TARGET_FIXUP rm -rf $(TARGET_DIR)/var/lib/dbus ln -sf /tmp/dbus $(TARGET_DIR)/var/lib/dbus - $(INSTALL) -m 0755 package/dbus/S30dbus $(TARGET_DIR)/etc/init.d + $(INSTALL) -m 0755 -D package/dbus/S30dbus $(TARGET_DIR)/etc/init.d/S30dbus endef DBUS_POST_INSTALL_TARGET_HOOKS += DBUS_INSTALL_TARGET_FIXUP
Signature · 1 line
1.7.2.3
PATCH 3/16 hostapd: ensure hostapd binaries are installed in the right place
In reply to llandwerlin at gmail.comFrom: Lionel Landwerlin <[email protected]>
Ensure hostapd and hostapd_cli are installed in /usr/bin/ even if the directory does not exist.
--- package/hostapd/hostapd.mk | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
package/hostapd/hostapd.mk +5 -5
@@ -74,7 +74,7 @@ define HOSTAPD_CONFIGURE_CMDS $(SED) "s/^#CONFIG_DRIVER_WIRED/CONFIG_DRIVER_WIRED/" $(HOSTAPD_CONFIG) $(SED) "s/^#CONFIG_DRIVER_NL80211/CONFIG_DRIVER_NL80211/" $(HOSTAPD_CONFIG) # Misc - $(SED) "s/^CONFIG_IPV6/#CONFIG_IPV6/" $(HOSTAPD_CONFIG) + $(SED) "s/^CONFIG_IPV6/#CONFIG_IPV6/" $(HOSTAPD_CONFIG) $(SED) "s/^#CONFIG_IEEE80211N/CONFIG_IEEE80211N/" $(HOSTAPD_CONFIG) $(SED) "s/^#CONFIG_IEEE80211R/CONFIG_IEEE80211R/" $(HOSTAPD_CONFIG) $(HOSTAPD_CRYPTO_CONFIG)
@@ -85,10 +85,10 @@ define HOSTAPD_CONFIGURE_CMDS endef define HOSTAPD_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 $(@D)/$(HOSTAPD_SUBDIR)/hostapd \ - $(TARGET_DIR)/usr/sbin - $(INSTALL) -m 0755 $(@D)/$(HOSTAPD_SUBDIR)/hostapd_cli \ - $(TARGET_DIR)/usr/bin + $(INSTALL) -m 0755 -D $(@D)/$(HOSTAPD_SUBDIR)/hostapd \ + $(TARGET_DIR)/usr/sbin/hostapd + $(INSTALL) -m 0755 -D $(@D)/$(HOSTAPD_SUBDIR)/hostapd_cli \ + $(TARGET_DIR)/usr/bin/hostapd_cli endef define HOSTAPD_UNINSTALL_TARGET_CMDS
Signature · 1 line
1.7.2.3
PATCH 4/16 cloop: ensure target directory exist before copying into
In reply to llandwerlin at gmail.comFrom: Lionel Landwerlin <[email protected]>
--- package/cloop/cloop.mk | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
package/cloop/cloop.mk +4 -3
@@ -10,9 +10,10 @@ define HOST_CLOOP_BUILD_CMDS endef define HOST_CLOOP_INSTALL_CMDS - install -m 755 $(@D)/create_compressed_fs $(HOST_DIR)/usr/bin - install -m 755 $(@D)/extract_compressed_fs $(HOST_DIR)/usr/bin + $(INSTALL) -m 0755 -d $(HOST_DIR)/usr/bin + $(INSTALL) -m 755 $(@D)/create_compressed_fs $(HOST_DIR)/usr/bin + $(INSTALL) -m 755 $(@D)/extract_compressed_fs $(HOST_DIR)/usr/bin endef $(eval $(call GENTARGETS,package,cloop)) -$(eval $(call GENTARGETS,package,cloop,host)) +$(eval $(call GENTARGETS,package,cloop,host))
Signature · 1 line
1.7.2.3
PATCH 5/16 i2c-tools: ensure binaries are installed in the right place
In reply to llandwerlin at gmail.comFrom: Lionel Landwerlin <[email protected]>
--- package/i2c-tools/i2c-tools.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
package/i2c-tools/i2c-tools.mk +1 -1
@@ -12,10 +12,10 @@ define I2C_TOOLS_BUILD_CMDS endef define I2C_TOOLS_INSTALL_TARGET_CMDS + $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin for i in i2cdump i2cget i2cset i2cdetect; \ do \ $(INSTALL) -m 755 $(@D)/tools/$$i $(TARGET_DIR)/usr/bin/$$i; \ - $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/$$i; \ done endef
Signature · 1 line
1.7.2.3
PATCH 6/16 udev: ensure startup script is well installed
In reply to llandwerlin at gmail.comFrom: Lionel Landwerlin <[email protected]>
In case /etc/init.d does not exists.
--- package/udev/udev.mk | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
package/udev/udev.mk +2 -0
@@ -88,7 +88,9 @@ define UDEV_INSTALL_TARGET_CMDS LDFLAGS="-warn-common" \ USE_LOG=false USE_SELINUX=false \ udevdir=$(UDEV_ROOT) EXTRAS="$(UDEV_BUILD_EXTRAS)" -C $(@D) install + $(INSTALL) -m 0755 -d $(TARGET_DIR)/etc/init.d $(INSTALL) -m 0755 package/udev/S10udev $(TARGET_DIR)/etc/init.d + $(INSTALL) -m 0755 -d $(TARGET_DIR)/etc/udev/rules.d $(INSTALL) -m 0644 $(@D)/etc/udev/frugalware/* $(TARGET_DIR)/etc/udev/rules.d ( grep udev_root $(TARGET_DIR)/etc/udev/udev.conf > /dev/null 2>&1 || echo 'udev_root=/dev' >> $(TARGET_DIR)/etc/udev/udev.conf ) install -m 0755 -D $(@D)/udevstart $(TARGET_DIR)/sbin/udevstart
Signature · 1 line
1.7.2.3
PATCH 7/16 busybox: move udhcp script from skeleton to package
In reply to llandwerlin at gmail.comFrom: Lionel Landwerlin <[email protected]>
Since udhcpc is part of busybox, it seems logical to move the udhcpc script from skeleton to busybox.
--- fs/skeleton/usr/share/udhcpc/default.script | 39 --------------------------- package/busybox/busybox.mk | 2 +- package/busybox/udhcpc.script | 39 +++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 40 deletions(-) delete mode 100755 fs/skeleton/usr/share/udhcpc/default.script create mode 100755 package/busybox/udhcpc.script
fs/skeleton/usr/share/udhcpc/default.script deleted +0 -39
@@ -1,39 +0,0 @@ -#!/bin/sh - -# udhcpc script edited by Tim Riker <[email protected]> - -[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 - -RESOLV_CONF="/etc/resolv.conf" -[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" -[ -n "$subnet" ] && NETMASK="netmask $subnet" - -case "$1" in - deconfig) - /sbin/ifconfig $interface 0.0.0.0 - ;; - - renew|bound) - /sbin/ifconfig $interface $ip $BROADCAST $NETMASK - - if [ -n "$router" ] ; then - echo "deleting routers" - while route del default gw 0.0.0.0 dev $interface ; do - : - done - - for i in $router ; do - route add default gw $i dev $interface - done - fi - - echo -n > $RESOLV_CONF - [ -n "$domain" ] && echo search $domain >> $RESOLV_CONF - for i in $dns ; do - echo adding dns $i - echo nameserver $i >> $RESOLV_CONF - done - ;; -esac - -exit 0
package/busybox/busybox.mk +1 -1
@@ -141,7 +141,7 @@ endif define BUSYBOX_INSTALL_TARGET_CMDS $(BUSYBOX_INSTALL_BINARY) - -chmod a+rx $(TARGET_DIR)/usr/share/udhcpc/default.script + $(INSTALL) -m 0755 -D package/busybox/udhcpc.script $(TARGET_DIR)/usr/share/udhcpc/default.script endef define BUSYBOX_UNINSTALL_TARGET_CMDS
package/busybox/udhcpc.script new file +39 -0
@@ -0,0 +1,39 @@ +#!/bin/sh + +# udhcpc script edited by Tim Riker <[email protected]> + +[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 + +RESOLV_CONF="/etc/resolv.conf" +[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" +[ -n "$subnet" ] && NETMASK="netmask $subnet" + +case "$1" in + deconfig) + /sbin/ifconfig $interface 0.0.0.0 + ;; + + renew|bound) + /sbin/ifconfig $interface $ip $BROADCAST $NETMASK + + if [ -n "$router" ] ; then + echo "deleting routers" + while route del default gw 0.0.0.0 dev $interface ; do + : + done + + for i in $router ; do + route add default gw $i dev $interface + done + fi + + echo -n > $RESOLV_CONF + [ -n "$domain" ] && echo search $domain >> $RESOLV_CONF + for i in $dns ; do + echo adding dns $i + echo nameserver $i >> $RESOLV_CONF + done + ;; +esac + +exit 0
Signature · 1 line
1.7.2.3
PATCH 7/16 busybox: move udhcp script from skeleton to package
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"llandwerlin" == llandwerlin <[email protected]> writes:
llandwerlin> From: Lionel Landwerlin <[email protected]> llandwerlin> Since udhcpc is part of busybox, it seems logical to move the udhcpc llandwerlin> script from skeleton to busybox.
We have a number of (somewhat) different default.script files in the skeletons:
find -name default.script|xargs md5sum|sort
07e9a6d08f1cb076af6f54f1f69b76e2 ./Atmel/atngw100/target_skeleton/usr/share/udhcpc/default.script 07e9a6d08f1cb076af6f54f1f69b76e2 ./Atmel/atstk1005/target_skeleton/usr/share/udhcpc/default.script 07e9a6d08f1cb076af6f54f1f69b76e2 ./Atmel/atstk100x/target_skeleton/usr/share/udhcpc/default.script 0869726c3fdd7a10f9ea5b368a9474a0 ./Atmel/root/target_skeleton/usr/share/udhcpc/default.script 33cc63bd3d159030a849105e719d0592 ./KwikByte/kb9202/target_skeleton/usr/share/udhcpc/default.script f5b6d601ced4aad0e6de650234200381 ./valka/target_skeleton/usr/share/udhcpc/default.script
So I prefer to only install if the skeleton hasn't defined a custom one like we do elsewhere.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 7/16 busybox: move udhcp script from skeleton to package
Quoted 10 lines · On Mon, 13 Dec 2010 00:31:17 +0100 Peter Korsgaard <[email protected]> wrote:
We have a number of (somewhat) different default.script files in the skeletons:
find -name default.script|xargs md5sum|sort07e9a6d08f1cb076af6f54f1f69b76e2 ./Atmel/atngw100/target_skeleton/usr/share/udhcpc/default.script 07e9a6d08f1cb076af6f54f1f69b76e2 ./Atmel/atstk1005/target_skeleton/usr/share/udhcpc/default.script 07e9a6d08f1cb076af6f54f1f69b76e2 ./Atmel/atstk100x/target_skeleton/usr/share/udhcpc/default.script 0869726c3fdd7a10f9ea5b368a9474a0 ./Atmel/root/target_skeleton/usr/share/udhcpc/default.script 33cc63bd3d159030a849105e719d0592 ./KwikByte/kb9202/target_skeleton/usr/share/udhcpc/default.script f5b6d601ced4aad0e6de650234200381 ./valka/target_skeleton/usr/share/udhcpc/default.script
Quoted 2 lines
So I prefer to only install if the skeleton hasn't defined a custom one like we do elsewhere.
FWIW, my boards-cleanup branch gets rid of all those redundant skeletons.
Regards,
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 8/16 sdl_sound: avoid using non reevaluated $(STAGING_DIR)
In reply to llandwerlin at gmail.comFrom: Lionel Landwerlin <[email protected]>
--- package/sdl_sound/sdl_sound.mk | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)
package/sdl_sound/sdl_sound.mk +6 -5
@@ -28,11 +28,12 @@ ifeq ($(BR2_PACKAGE_SPEEX),y) SDL_SOUND_DEPENDENCIES += speex endif -SDL_SOUND_CONF_OPT:=--with-sdl-prefix=$(STAGING_DIR)/usr \ - --with-sdl-exec-prefix=$(STAGING_DIR)/usr \ - --disable-sdltest \ - --enable-static \ - --program-prefix='' +SDL_SOUND_CONF_OPT = \ + --with-sdl-prefix=$(STAGING_DIR)/usr \ + --with-sdl-exec-prefix=$(STAGING_DIR)/usr \ + --disable-sdltest \ + --enable-static \ + --program-prefix='' # enable mmx for newer x86's ifeq ($(BR2_i386)$(BR2_x86_i386)$(BR2_x86_i486)$(BR2_x86_i586)$(BR2_x86_pentiumpro)$(BR2_x86_geode),y)
Signature · 1 line
1.7.2.3
PATCH 9/16 sdl_gfx: avoid using non reevaluated $(STAGING_DIR)
In reply to llandwerlin at gmail.comFrom: Lionel Landwerlin <[email protected]>
--- package/sdl_gfx/sdl_gfx.mk | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
package/sdl_gfx/sdl_gfx.mk +4 -3
@@ -12,9 +12,10 @@ SDL_GFX_INSTALL_TARGET:=YES SDL_GFX_DEPENDENCIES:=sdl -SDL_GFX_CONF_OPT:=--with-sdl-prefix=$(STAGING_DIR)/usr \ - --disable-sdltest \ - --enable-static +SDL_GFX_CONF_OPT = \ + --with-sdl-prefix=$(STAGING_DIR)/usr \ + --disable-sdltest \ + --enable-static # enable mmx for newer x86's ifeq ($(BR2_i386)$(BR2_x86_i386)$(BR2_x86_i486)$(BR2_x86_i586)$(BR2_x86_pentiumpro)$(BR2_x86_geode),y)
Signature · 1 line
1.7.2.3
PATCH 10/16 cups: avoid using non reevaluated $(STAGING_DIR)
In reply to llandwerlin at gmail.comFrom: Lionel Landwerlin <[email protected]>
--- package/cups/cups.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
package/cups/cups.mk +1 -1
@@ -8,7 +8,7 @@ CUPS_NAME = cups-$(CUPS_VERSION) CUPS_DIR = $(BUILD_DIR)/$(CUPS_NAME) CUPS_SITE = http://ftp.easysw.com/pub/cups/$(CUPS_VERSION) CUPS_SOURCE:=$(CUPS_NAME)-source.tar.bz2 -CUPS_DESTDIR:=$(STAGING_DIR)/usr/lib +CUPS_DESTDIR = $(STAGING_DIR)/usr/lib CUPS_CAT:=$(BZCAT) ifeq ($(BR2_PACKAGE_DBUS),y)
Signature · 1 line
1.7.2.3
PATCH 11/16 rsync: avoid using non reevaluated $(TARGET_DIR) in RSYNC_INSTALL_TARGET_OPT
In reply to llandwerlin at gmail.comFrom: Lionel Landwerlin <[email protected]>
--- package/rsync/rsync.mk | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)
package/rsync/rsync.mk +9 -9
@@ -4,19 +4,19 @@ # ############################################################# -RSYNC_VERSION:=3.0.7 -RSYNC_SOURCE:=rsync-$(RSYNC_VERSION).tar.gz -RSYNC_SITE:=http://rsync.samba.org/ftp/rsync/src -RSYNC_INSTALL_STAGING:=NO -RSYNC_INSTALL_TARGET:=YES -RSYNC_CONF_OPT=$(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug) +RSYNC_VERSION := 3.0.7 +RSYNC_SOURCE := rsync-$(RSYNC_VERSION).tar.gz +RSYNC_SITE := http://rsync.samba.org/ftp/rsync/src +RSYNC_INSTALL_STAGING = NO +RSYNC_INSTALL_TARGET = YES +RSYNC_CONF_OPT = $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug) ifeq ($(BR2_ENABLE_DEBUG),y) -RSYNC_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) INSTALLCMD='./install-sh -c' \ +RSYNC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) INSTALLCMD='./install-sh -c' \ install else -RSYNC_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) INSTALLCMD='./install-sh -c' \ +RSYNC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) INSTALLCMD='./install-sh -c' \ STRIPPROG="$(TARGET_STRIP)" install-strip endif -RSYNC_CONF_OPT:=--with-included-popt +RSYNC_CONF_OPT = --with-included-popt $(eval $(call AUTOTARGETS,package,rsync))
Signature · 1 line
1.7.2.3
PATCH 12/16 gdk-pixbuf: ensure startup script is well installed
In reply to llandwerlin at gmail.comFrom: Lionel Landwerlin <[email protected]>
In case /etc/init.d does not exist.
--- package/gdk-pixbuf/gdk-pixbuf.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
package/gdk-pixbuf/gdk-pixbuf.mk +1 -0
@@ -44,6 +44,7 @@ GDK_PIXBUF_DEPENDENCIES += \ host-pkg-config libglib2 define GDK_PIXBUF_POST_INSTALL_TWEAKS + $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d $(INSTALL) -m 755 package/gdk-pixbuf/S26gdk-pixbuf $(TARGET_DIR)/etc/init.d/ endef
Signature · 1 line
1.7.2.3
PATCH 13/16 pango: ensure startup script is well installed
In reply to llandwerlin at gmail.comFrom: Lionel Landwerlin <[email protected]>
In case /etc/init.d does not exist.
--- package/pango/pango.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
package/pango/pango.mk +1 -0
@@ -55,6 +55,7 @@ else endif define PANGO_INSTALL_INITSCRIPT + $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d $(INSTALL) -m 755 package/pango/S25pango $(TARGET_DIR)/etc/init.d/ endef
Signature · 1 line
1.7.2.3
PATCH 14/16 at: ensure startup script is well installed
In reply to llandwerlin at gmail.comFrom: Lionel Landwerlin <[email protected]>
In case /etc/init.d does not exist.
--- package/at/at.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
package/at/at.mk +1 -0
@@ -20,6 +20,7 @@ AT_CONF_OPT = \ SENDMAIL=/usr/sbin/sendmail define AT_INSTALL_INITSCRIPT + $(INSTALL) -m 0755 -d $(TARGET_DIR)/etc/init.d $(INSTALL) -m 0755 package/at/S99at $(TARGET_DIR)/etc/init.d/S99at endef
Signature · 1 line
1.7.2.3
PATCH 15/16 bzip2: ensure target directories exist before copying into
In reply to llandwerlin at gmail.comFrom: Lionel Landwerlin <[email protected]>
Also simply installation rules a little
--- package/bzip2/bzip2.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
package/bzip2/bzip2.mk +3 -3
@@ -39,7 +39,9 @@ define BZIP2_BUILD_CMDS endef define BZIP2_INSTALL_STAGING_CMDS - cp $(@D)/bzlib.h $(STAGING_DIR)/usr/include/ + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \ + $(MAKE) PREFIX=$(STAGING_DIR)/usr -C $(@D) install + $(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/lib cp $(@D)/libbz2.so.$(BZIP2_SONAME) $(STAGING_DIR)/usr/lib/ cp $(@D)/libbz2.a $(STAGING_DIR)/usr/lib/ (cd $(STAGING_DIR)/usr/lib/; \
@@ -49,9 +51,7 @@ define BZIP2_INSTALL_STAGING_CMDS ) endef -# make sure busybox doesn't get overwritten by make install define BZIP2_INSTALL_TARGET_CMDS - rm -f $(addprefix $(TARGET_DIR)/usr/bin/,bzip2 bunzip2 bzcat) $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \ $(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(@D) install cp $(@D)/libbz2.so.$(BZIP2_SONAME) $(TARGET_DIR)/usr/lib/
Signature · 1 line
1.7.2.3
PATCH 16/16 directfb-examples: rework target installation rule to match package infrastructure
In reply to llandwerlin at gmail.comFrom: Lionel Landwerlin <[email protected]>
--- package/directfb-examples/directfb-examples.mk | 111 ++++++++++++------------ 1 files changed, 56 insertions(+), 55 deletions(-)
package/directfb-examples/directfb-examples.mk +56 -55
@@ -38,67 +38,68 @@ DIRECTFB_EXAMPLES_TARGETS_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_VIDEO) += usr/bin/df_v DIRECTFB_EXAMPLES_TARGETS_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_VIDEO_PARTICLE) += usr/bin/df_video_particle DIRECTFB_EXAMPLES_TARGETS_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_WINDOW) += usr/bin/df_window -$(eval $(call AUTOTARGETS,package,directfb-examples)) +DIRECTFB_EXAMPLES_DATA_ := +DIRECTFB_EXAMPLES_DATA_y := + +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_ANDI) += usr/share/directfb-examples/destination_mask.png +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_ANDI) += usr/share/directfb-examples/tux.png +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_ANDI) += usr/share/directfb-examples/wood_andi.jpg + +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_DOK) += usr/share/directfb-examples/biglogo.png +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_DOK) += usr/share/directfb-examples/card.png +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_DOK) += usr/share/directfb-examples/melted.png +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_DOK) += usr/share/directfb-examples/meter.png +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_DOK) += usr/share/directfb-examples/pngtest*.png +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_DOK) += usr/share/directfb-examples/colorkeyed.gif +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_DOK) += usr/share/directfb-examples/intro.png +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_DOK) += usr/share/directfb-examples/fish.png +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_DOK) += usr/share/directfb-examples/swirl.png + +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_DRIVERTEST) += usr/share/directfb-examples/pngtest.png +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_DRIVERTEST) += usr/share/directfb-examples/testmask.png + +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_INPUT) += usr/share/directfb-examples/joystick.png +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_INPUT) += usr/share/directfb-examples/gnu-keys.png +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_INPUT) += usr/share/directfb-examples/gnome-mouse.png + +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_NEO) += usr/share/directfb-examples/apple-red.png +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_NEO) += usr/share/directfb-examples/gnome-*.png +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_NEO) += usr/share/directfb-examples/gnu-*.png +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_NEO) += usr/share/directfb-examples/background*.jpg + +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_STRESS) += usr/share/directfb-examples/melted.png + +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_TEXTURE) += usr/share/directfb-examples/texture.png -$(DIRECTFB_EXAMPLES_TARGET_INSTALL_TARGET): $(DIRECTFB_EXAMPLES_TARGET_INSTALL_STAGING) - $(call MESSAGE,"Installing to target") +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_VIDEO) += usr/share/directfb-examples/shot.png + +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_VIDEO_PARTICLE) += usr/share/directfb-examples/convergence.png + +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_WINDOW) += usr/share/directfb-examples/desktop.png +DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_WINDOW) += usr/share/directfb-examples/dfblogo.png + +DIRECTFB_EXAMPLES_FONT_y := +ifeq ($(BR2_PACKAGE_DIRECTFB_EXAMPLES_FONTS),y) +DIRECTFB_EXAMPLES_FONT_y = usr/share/directfb-examples/fonts/* +endif + +define DIRECTFB_EXAMPLES_INSTALL_TARGET_CMDS $(Q)mkdir -p $(TARGET_DIR)/usr/bin $(Q)mkdir -p $(TARGET_DIR)/usr/share/directfb-examples/ $(Q)mkdir -p $(TARGET_DIR)/usr/share/directfb-examples/fonts/ - for file in $(DIRECTFB_EXAMPLES_TARGETS_y); do \ + $(Q)for file in $(DIRECTFB_EXAMPLES_TARGETS_y); do \ cp -dpf $(STAGING_DIR)/$$file $(TARGET_DIR)/$$file; \ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$$file; \ done $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/fonts/decker.ttf $(TARGET_DIR)/usr/share/directfb-examples/fonts/ -ifeq ($(BR2_PACKAGE_DIRECTFB_EXAMPLES_ANDI),y) - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/destination_mask.png $(TARGET_DIR)/usr/share/directfb-examples/ - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/tux.png $(TARGET_DIR)/usr/share/directfb-examples/ - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/wood_andi.jpg $(TARGET_DIR)/usr/share/directfb-examples/ -endif -ifeq ($(BR2_PACKAGE_DIRECTFB_EXAMPLES_DOK),y) - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/biglogo.png $(TARGET_DIR)/usr/share/directfb-examples/ - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/card.png $(TARGET_DIR)/usr/share/directfb-examples/ - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/melted.png $(TARGET_DIR)/usr/share/directfb-examples/ - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/meter.png $(TARGET_DIR)/usr/share/directfb-examples/ - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/pngtest*.png $(TARGET_DIR)/usr/share/directfb-examples/ - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/colorkeyed.gif $(TARGET_DIR)/usr/share/directfb-examples/ - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/intro.png $(TARGET_DIR)/usr/share/directfb-examples/ - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/fish.png $(TARGET_DIR)/usr/share/directfb-examples/ - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/swirl.png $(TARGET_DIR)/usr/share/directfb-examples/ -endif -ifeq ($(BR2_PACKAGE_DIRECTFB_EXAMPLES_DRIVERTEST),y) - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/pngtest.png $(TARGET_DIR)/usr/share/directfb-examples/ - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/testmask.png $(TARGET_DIR)/usr/share/directfb-examples/ -endif -ifeq ($(BR2_PACKAGE_DIRECTFB_EXAMPLES_FONTS),y) - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/fonts/* $(TARGET_DIR)/usr/share/directfb-examples/fonts/ -endif -ifeq ($(BR2_PACKAGE_DIRECTFB_EXAMPLES_INPUT),y) - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/joystick.png $(TARGET_DIR)/usr/share/directfb-examples/ - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/gnu-keys.png $(TARGET_DIR)/usr/share/directfb-examples/ - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/gnome-mouse.png $(TARGET_DIR)/usr/share/directfb-examples/ -endif -ifeq ($(BR2_PACKAGE_DIRECTFB_EXAMPLES_NEO),y) - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/apple-red.png $(TARGET_DIR)/usr/share/directfb-examples/ - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/gnome-*.png $(TARGET_DIR)/usr/share/directfb-examples/ - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/gnu-*.png $(TARGET_DIR)/usr/share/directfb-examples/ - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/background*.jpg $(TARGET_DIR)/usr/share/directfb-examples/ -endif -ifeq ($(BR2_PACKAGE_DIRECTFB_EXAMPLES_STRESS),y) - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/melted.png $(TARGET_DIR)/usr/share/directfb-examples/ -endif -ifeq ($(BR2_PACKAGE_DIRECTFB_EXAMPLES_TEXTURE),y) - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/texture.png $(TARGET_DIR)/usr/share/directfb-examples/ -endif -ifeq ($(BR2_PACKAGE_DIRECTFB_EXAMPLES_VIDEO),y) - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/shot.png $(TARGET_DIR)/usr/share/directfb-examples/ -endif -ifeq ($(BR2_PACKAGE_DIRECTFB_EXAMPLES_VIDEO_PARTICLE),y) - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/convergence.png $(TARGET_DIR)/usr/share/directfb-examples/ -endif -ifeq ($(BR2_PACKAGE_DIRECTFB_EXAMPLES_WINDOW),y) - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/desktop.png $(TARGET_DIR)/usr/share/directfb-examples/ - $(Q)cp -rdpf $(STAGING_DIR)/usr/share/directfb-examples/dfblogo.png $(TARGET_DIR)/usr/share/directfb-examples/ -endif - touch $@ + $(Q)for file in $(DIRECTFB_EXAMPLES_FONT_y); do \ + $(INSTALL) -m 0644 $(STAGING_DIR)/$$file $(TARGET_DIR)/usr/share/directfb-examples/fonts/; \ + done + $(Q)$(INSTALL) -m 0755 -d $(TARGET_DIR)/usr/share/directfb-examples + $(Q)for file in $(DIRECTFB_EXAMPLES_DATA_y); do \ + $(INSTALL) -m 0644 $(STAGING_DIR)/$$file $(TARGET_DIR)/usr/share/directfb-examples; \ + done +endef + +$(eval $(call AUTOTARGETS,package,directfb-examples))
Signature · 1 line
1.7.2.3
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"llandwerlin" == llandwerlin <[email protected]> writes:
llandwerlin> Hi,
llandwerlin> Here is the v2 of the preparation branch for package llandwerlin> generation. It takes into account remarks from the llandwerlin> previous pull request.
Thanks, committed with minor edits (mainly use install -D)
Signature · 1 line
Bye, Peter Korsgaard