Skip to contentSkip to conversation

For branch pre-package-generation-2011.02

GIT PULL New llandwerlin at gmail.com 3 participants 30 messages Dec 8, 2010 – Dec 12, 2010

lore
Share & tools
lore
#0 lore raw

Hi,

In preparation of the package generation work, some fixes have to be done. These fixes are mostly related to ensure files are well installed even in an empty directory and also ensure $(STAGING_DIR) and $(TARGET_DIR) are evaluated at the right moment (ie. when we're going to replace these variables to generate a tarball/ipk package/etc...).

This branch is pullable here :

     git://git.potipota.net/buildroot pre-package-generation-2011.02

Best regards,

--
Lionel Landwerlin

#1 lore raw

PATCH 1/17 gdk-pixbuf: fix dependency on libiconv

From: Lionel Landwerlin <[email protected]>

---
 package/gdk-pixbuf/gdk-pixbuf.mk |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
package/gdk-pixbuf/gdk-pixbuf.mk +4 -1
index f762095..f129e46 100644
@@ -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
#2 lore raw

PATCH 1/17 gdk-pixbuf: fix dependency on libiconv

package/gdk-pixbuf/gdk-pixbuf.mk else · line 44

Quoted 4 lines · On Wed, 8 Dec 2010 10:53:53 +0100 llandwerlin at gmail.com wrote:
package/gdk-pixbuf/gdk-pixbuf.mk +4 -0
+GDK_PIXBUF_DEPENDENCIES += \
+	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) \
+	$(if $(BR2_ENABLE_LOCALE),,libiconv) \
+	host-pkg-config libglib2

Then maybe, in package/gdk-pixbuf/Config.in:

select BR2_PACKAGE_ICONV if !BR2_ENABLE_LOCALE

?

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#3 lore raw

PATCH 1/17 gdk-pixbuf: fix dependency on libiconv

Le mercredi 08 d?cembre 2010 ? 20:08 +0100, Thomas Petazzoni a ?crit :

Quoted 10 lines

package/gdk-pixbuf/gdk-pixbuf.mk else · line 44

Quoted 4 lines · On Wed, 8 Dec 2010 10:53:53 +0100 llandwerlin at gmail.com wrote:
package/gdk-pixbuf/gdk-pixbuf.mk +4 -0
+GDK_PIXBUF_DEPENDENCIES += \
+	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) \
+	$(if $(BR2_ENABLE_LOCALE),,libiconv) \
+	host-pkg-config libglib2

Then maybe, in package/gdk-pixbuf/Config.in:

Quoted 4 lines

select BR2_PACKAGE_ICONV if !BR2_ENABLE_LOCALE

?

Sure, thx !

#4 lore raw

PATCH 2/17 dbus: ensure startup script is well installed

In reply to llandwerlin at gmail.com

From: 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 |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
package/dbus/dbus.mk +1 -0
index 1820286..496b9e7 100644
@@ -60,6 +60,7 @@ endif
 define DBUS_INSTALL_TARGET_FIXUP
 	rm -rf $(TARGET_DIR)/var/lib/dbus
 	ln -sf /tmp/dbus $(TARGET_DIR)/var/lib/dbus
+	mkdir -p $(TARGET_DIR)/etc/init.d
 	$(INSTALL) -m 0755 package/dbus/S30dbus $(TARGET_DIR)/etc/init.d
 endef
 
Signature · 1 line
1.7.2.3
#5 lore raw

PATCH 3/17 hostapd: ensure hostapd binaries are installed in the right place

In reply to llandwerlin at gmail.com

From: 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 |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
package/hostapd/hostapd.mk +2 -0
index 27689b8..148db63 100644
@@ -85,8 +85,10 @@ define HOSTAPD_CONFIGURE_CMDS
 endef
 
 define HOSTAPD_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/usr/sbin
 	$(INSTALL) -m 0755 $(@D)/$(HOSTAPD_SUBDIR)/hostapd \
 		$(TARGET_DIR)/usr/sbin
+	mkdir -p $(TARGET_DIR)/usr/bin
 	$(INSTALL) -m 0755 $(@D)/$(HOSTAPD_SUBDIR)/hostapd_cli \
 		$(TARGET_DIR)/usr/bin
 endef
Signature · 1 line
1.7.2.3
#6 lore raw

PATCH 4/17 cloop: ensure target directory exist before copying into

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

---
 package/cloop/cloop.mk |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
package/cloop/cloop.mk +1 -0
index 0ed9ff0..03008a4 100644
@@ -10,6 +10,7 @@ define HOST_CLOOP_BUILD_CMDS
 endef
 
 define HOST_CLOOP_INSTALL_CMDS
+ mkdir -p $(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
Signature · 1 line
1.7.2.3
#7 lore raw

PATCH 5/17 ifplugd: ensure target directories exist before copying into

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

---
 package/ifplugd/ifplugd.mk |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
package/ifplugd/ifplugd.mk +1 -0
index 5e66cea..0be903c 100644
@@ -22,6 +22,7 @@ define IFPLUGD_INSTALL_FIXUP
 		$(INSTALL) $(@D)/conf/ifplugd.conf $(TARGET_DIR)/etc/ifplugd/; \
 		$(SED) 's^\(ARGS=.*\)w^\1^' $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \
 	fi
+	mkdir -p $(TARGET_DIR)/etc/ifplugd
 	$(INSTALL) -m 0755 $(@D)/conf/ifplugd.action \
 		$(TARGET_DIR)/etc/ifplugd/
 	$(INSTALL) -m 0755 $(@D)/conf/ifplugd.init \
Signature · 1 line
1.7.2.3
#8 lore raw

PATCH 5/17 ifplugd: ensure target directories exist before copying into

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> Signed-off-by: Lionel Landwerlin <[email protected]> llandwerlin> ---

 llandwerlin>  package/ifplugd/ifplugd.mk |    1 +

llandwerlin> 1 files changed, 1 insertions(+), 0 deletions(-)

llandwerlin> diff --git a/package/ifplugd/ifplugd.mk b/package/ifplugd/ifplugd.mk llandwerlin> index 5e66cea..0be903c 100644
llandwerlin> --- a/package/ifplugd/ifplugd.mk
llandwerlin> +++ b/package/ifplugd/ifplugd.mk
llandwerlin> @@ -22,6 +22,7 @@ define IFPLUGD_INSTALL_FIXUP

 llandwerlin>  		$(INSTALL) $(@D)/conf/ifplugd.conf $(TARGET_DIR)/etc/ifplugd/; \
 llandwerlin>  		$(SED) 's^\(ARGS=.*\)w^\1^' $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \
 llandwerlin>  	fi

llandwerlin> + mkdir -p $(TARGET_DIR)/etc/ifplugd

Hmm, just a few lines above we have install -d $(TARGET_DIR)/etc/ifplugd
- Isn't that working for you?

Signature · 1 line
Bye, Peter Korsgaard
#9 lore raw

PATCH 6/17 i2c-tools: ensure binaries are installed in the right place

In reply to llandwerlin at gmail.com

From: 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
index d419524..2e60407 100644
@@ -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
#10 lore raw

PATCH 6/17 i2c-tools: ensure binaries are installed in the right place

package/i2c-tools/i2c-tools.mk define I2C_TOOLS_BUILD_CMDS · line 15

Quoted 2 lines · On Wed, 8 Dec 2010 10:53:58 +0100 llandwerlin at gmail.com wrote:

define I2C_TOOLS_INSTALL_TARGET_CMDS

package/i2c-tools/i2c-tools.mk +1 -0
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin

In some packages you're doing mkdir -p, in others $(INSTALL) -m 755 -d. Maybe we should standardize on one or the other ?

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#11 lore raw

PATCH 6/17 i2c-tools: ensure binaries are installed in the right place

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> On Wed, 8 Dec 2010 10:53:58 +0100

Quoted 2 lines · Thomas> llandwerlin at gmail.com wrote:

package/i2c-tools/i2c-tools.mk define I2C_TOOLS_BUILD_CMDS · line 15

Quoted 2 lines

define I2C_TOOLS_INSTALL_TARGET_CMDS

package/i2c-tools/i2c-tools.mk +1 -0
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin

Thomas> In some packages you're doing mkdir -p, in others $(INSTALL) -m 755 -d. Thomas> Maybe we should standardize on one or the other ?

Actually, the nicest would imho be to use install -D (E.G. create parent dirs if not available).

Signature · 1 line
Bye, Peter Korsgaard
#12 lore raw

PATCH 6/17 i2c-tools: ensure binaries are installed in the right place

In reply to llandwerlin at gmail.com
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> Signed-off-by: Lionel Landwerlin <[email protected]> llandwerlin> ---

 llandwerlin>  package/i2c-tools/i2c-tools.mk |    2 +-

llandwerlin> 1 files changed, 1 insertions(+), 1 deletions(-)

llandwerlin> diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk llandwerlin> index d419524..2e60407 100644
llandwerlin> --- a/package/i2c-tools/i2c-tools.mk
llandwerlin> +++ b/package/i2c-tools/i2c-tools.mk
llandwerlin> @@ -12,10 +12,10 @@ define I2C_TOOLS_BUILD_CMDS
llandwerlin> endef

llandwerlin> define I2C_TOOLS_INSTALL_TARGET_CMDS
llandwerlin> + $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin

 llandwerlin>  	for i in i2cdump i2cget i2cset i2cdetect; \
 llandwerlin>  	do \
 llandwerlin>  		$(INSTALL) -m 755 $(@D)/tools/$$i $(TARGET_DIR)/usr/bin/$$i; \

We could simply use install -D here instead.

Signature · 1 line
Bye, Peter Korsgaard
#13 lore raw

PATCH 7/17 udev: ensure startup script is well installed

In reply to llandwerlin at gmail.com

From: 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
index 90dbdce..8da2798 100644
@@ -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
#14 lore raw

PATCH 8/17 busybox: move udhcp script from skeleton to package

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

---
 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
deleted file mode 100755
index a52a7f8..0000000
@@ -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
index b7f4740..da391ba 100644
@@ -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
new file mode 100755
index 0000000..a52a7f8
@@ -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
#15 lore raw

PATCH 8/17 busybox: move udhcp script from skeleton to package

Quoted 7 lines · On Wed, 8 Dec 2010 10:54:00 +0100 llandwerlin at gmail.com wrote:

From: Lionel Landwerlin <[email protected]>

---
 fs/skeleton/usr/share/udhcpc/default.script |   39 ---------------------------
 package/busybox/busybox.mk                  |    2 +-
 package/busybox/udhcpc.script               |   39 +++++++++++++++++++++++++++

Why is this needed ?

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#16 lore raw

PATCH 8/17 busybox: move udhcp script from skeleton to package

Le mercredi 08 d?cembre 2010 ? 20:12 +0100, Thomas Petazzoni a ?crit :

Quoted 5 lines
Quoted 2 lines · On Wed, 8 Dec 2010 10:54:00 +0100 llandwerlin at gmail.com wrote:

From: Lionel Landwerlin <[email protected]>

Quoted 8 lines
Quoted 5 lines
---
 fs/skeleton/usr/share/udhcpc/default.script |   39 ---------------------------
 package/busybox/busybox.mk                  |    2 +-
 package/busybox/udhcpc.script               |   39 +++++++++++++++++++++++++++

Why is this needed ?

default.script seems to be a config file related to busybox, why not manage all the busybox stuff into the busybox package ?

--
Lionel Landwerlin

#17 lore raw

PATCH 8/17 busybox: move udhcp script from skeleton to package

Quoted 2 lines · On Wed, 08 Dec 2010 21:55:33 +0100 Lionel Landwerlin <[email protected]>…

default.script seems to be a config file related to busybox, why not manage all the busybox stuff into the busybox package ?

Then this explanation should be part of the commit log :-)

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#18 lore raw

PATCH 8/17 busybox: move udhcp script from skeleton to package

In reply to Lionel Landwerlin
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Lionel" == Lionel Landwerlin <[email protected]> writes:

Lionel> Le mercredi 08 d?cembre 2010 ? 20:12 +0100, Thomas Petazzoni a ?crit :

Quoted 5 lines
Quoted 5 lines
Quoted 2 lines · On Wed, 8 Dec 2010 10:54:00 +0100 llandwerlin at gmail.com wrote:

From: Lionel Landwerlin <[email protected]>

Quoted 8 lines
Quoted 8 lines
Quoted 5 lines
---
 fs/skeleton/usr/share/udhcpc/default.script |   39 ---------------------------
 package/busybox/busybox.mk                  |    2 +-
 package/busybox/udhcpc.script               |   39 +++++++++++++++++++++++++++

Why is this needed ?

Lionel> default.script seems to be a config file related to busybox, why not Lionel> manage all the busybox stuff into the busybox package ?

True. Notice that the avahi overwrites it with a version with avahi-autoipd support if enabled. Looking at that script, it looks like we could simply always use the avahi one even if avahi isn't enabled.

Signature · 1 line
Bye, Peter Korsgaard
#19 lore raw

PATCH 9/17 sdl_sound: avoid using non reevaluated $(STAGING_DIR)

In reply to llandwerlin at gmail.com

From: 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
index bd94a62..6c45fcf 100644
@@ -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
#20 lore raw

PATCH 10/17 sdl_gfx: avoid using non reevaluated $(STAGING_DIR)

In reply to llandwerlin at gmail.com

From: 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
index bd4e3f1..bbfd99f 100644
@@ -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
#21 lore raw

PATCH 11/17 cups: avoid using non reevaluated $(STAGING_DIR)

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

---
 package/cups/cups.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/cups/cups.mk +1 -1
index 776fb57..169cdb3 100644
@@ -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
#22 lore raw

PATCH 12/17 rsync: avoid using non reevaluated $(TARGET_DIR) in RSYNC_INSTALL_TARGET_OPT

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

---
 package/rsync/rsync.mk |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)
package/rsync/rsync.mk +9 -9
index e1bb28e..5ffbfbb 100644
@@ -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
#23 lore raw

PATCH 13/17 gdk-pixbuf: ensure startup script is well installed

In reply to llandwerlin at gmail.com

From: 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
index f129e46..beba138 100644
@@ -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
#24 lore raw

PATCH 14/17 pango: ensure startup script is well installed

In reply to llandwerlin at gmail.com

From: 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
index 373eb8b..a350f92 100644
@@ -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
#25 lore raw

PATCH 14/17 pango: ensure startup script is well installed

package/pango/pango.mk else · line 60

Quoted 4 lines · On Wed, 8 Dec 2010 10:54:06 +0100 llandwerlin at gmail.com wrote:

define PANGO_INSTALL_INITSCRIPT

package/pango/pango.mk +1 -0
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
 	$(INSTALL) -m 755 package/pango/S25pango $(TARGET_DIR)/etc/init.d/
 endef

We could also do it in one line:

$(INSTALL) -m 755 -D package/pango/S25pango $(TARGET_DIR)/etc/init.d/S25pango

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#26 lore raw

PATCH 15/17 at: ensure startup script is well installed

In reply to llandwerlin at gmail.com

From: 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
index c38c424..531cb40 100644
@@ -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
#27 lore raw

PATCH 16/17 bzip2: ensure target directories exist before copying into

In reply to llandwerlin at gmail.com

From: 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
index 3f341ee..38bb461 100644
@@ -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
#28 lore raw

PATCH 16/17 bzip2: ensure target directories exist before copying into

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> Also simply installation rules a little

llandwerlin> -# make sure busybox doesn't get overwritten by make install llandwerlin> define BZIP2_INSTALL_TARGET_CMDS
llandwerlin> - rm -f $(addprefix $(TARGET_DIR)/usr/bin/,bzip2 bunzip2 bzcat)

 llandwerlin>  	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \
 llandwerlin>  	$(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(@D) install
 llandwerlin>  	cp $(@D)/libbz2.so.$(BZIP2_SONAME) $(TARGET_DIR)/usr/lib/

Please don't, as this breaks busybox as long as we use a shared TARGET_DIR (see 3917ab310490)

Signature · 1 line
Bye, Peter Korsgaard
#29 lore raw

PATCH 17/17 directfb-examples: rework target installation rule to match package infrastructure

In reply to llandwerlin at gmail.com

From: 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
index 065f720..aed9790 100644
@@ -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