* [Buildroot] [PATCH 01/17] gdk-pixbuf: fix dependency on libiconv
2010-12-08 9:53 [Buildroot] [pull request] For branch pre-package-generation-2011.02 llandwerlin at gmail.com
@ 2010-12-08 9:53 ` llandwerlin at gmail.com
2010-12-08 19:08 ` Thomas Petazzoni
2010-12-08 9:53 ` [Buildroot] [PATCH 02/17] dbus: ensure startup script is well installed llandwerlin at gmail.com
` (15 subsequent siblings)
16 siblings, 1 reply; 30+ messages in thread
From: llandwerlin at gmail.com @ 2010-12-08 9:53 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/gdk-pixbuf/gdk-pixbuf.mk | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
index f762095..f129e46 100644
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -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/
--
1.7.2.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 01/17] gdk-pixbuf: fix dependency on libiconv
2010-12-08 9:53 ` [Buildroot] [PATCH 01/17] gdk-pixbuf: fix dependency on libiconv llandwerlin at gmail.com
@ 2010-12-08 19:08 ` Thomas Petazzoni
2010-12-08 21:00 ` Lionel Landwerlin
0 siblings, 1 reply; 30+ messages in thread
From: Thomas Petazzoni @ 2010-12-08 19:08 UTC (permalink / raw)
To: buildroot
On Wed, 8 Dec 2010 10:53:53 +0100
llandwerlin at gmail.com wrote:
> +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
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 30+ messages in thread
* [Buildroot] [PATCH 01/17] gdk-pixbuf: fix dependency on libiconv
2010-12-08 19:08 ` Thomas Petazzoni
@ 2010-12-08 21:00 ` Lionel Landwerlin
0 siblings, 0 replies; 30+ messages in thread
From: Lionel Landwerlin @ 2010-12-08 21:00 UTC (permalink / raw)
To: buildroot
Le mercredi 08 d?cembre 2010 ? 20:08 +0100, Thomas Petazzoni a ?crit :
> On Wed, 8 Dec 2010 10:53:53 +0100
> llandwerlin at gmail.com wrote:
>
> > +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
>
> ?
>
Sure, thx !
^ permalink raw reply [flat|nested] 30+ messages in thread
* [Buildroot] [PATCH 02/17] dbus: ensure startup script is well installed
2010-12-08 9:53 [Buildroot] [pull request] For branch pre-package-generation-2011.02 llandwerlin at gmail.com
2010-12-08 9:53 ` [Buildroot] [PATCH 01/17] gdk-pixbuf: fix dependency on libiconv llandwerlin at gmail.com
@ 2010-12-08 9:53 ` llandwerlin at gmail.com
2010-12-08 9:53 ` [Buildroot] [PATCH 03/17] hostapd: ensure hostapd binaries are installed in the right place llandwerlin at gmail.com
` (14 subsequent siblings)
16 siblings, 0 replies; 30+ messages in thread
From: llandwerlin at gmail.com @ 2010-12-08 9:53 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
If /etc/init.d does not exist, we need to be sure that the dbus
startup script is installed at the right place.
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/dbus/dbus.mk | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 1820286..496b9e7 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -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
--
1.7.2.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 03/17] hostapd: ensure hostapd binaries are installed in the right place
2010-12-08 9:53 [Buildroot] [pull request] For branch pre-package-generation-2011.02 llandwerlin at gmail.com
2010-12-08 9:53 ` [Buildroot] [PATCH 01/17] gdk-pixbuf: fix dependency on libiconv llandwerlin at gmail.com
2010-12-08 9:53 ` [Buildroot] [PATCH 02/17] dbus: ensure startup script is well installed llandwerlin at gmail.com
@ 2010-12-08 9:53 ` llandwerlin at gmail.com
2010-12-08 9:53 ` [Buildroot] [PATCH 04/17] cloop: ensure target directory exist before copying into llandwerlin at gmail.com
` (13 subsequent siblings)
16 siblings, 0 replies; 30+ messages in thread
From: llandwerlin at gmail.com @ 2010-12-08 9:53 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Ensure hostapd and hostapd_cli are installed in /usr/bin/ even if the
directory does not exist.
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/hostapd/hostapd.mk | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk
index 27689b8..148db63 100644
--- a/package/hostapd/hostapd.mk
+++ b/package/hostapd/hostapd.mk
@@ -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
--
1.7.2.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 04/17] cloop: ensure target directory exist before copying into
2010-12-08 9:53 [Buildroot] [pull request] For branch pre-package-generation-2011.02 llandwerlin at gmail.com
` (2 preceding siblings ...)
2010-12-08 9:53 ` [Buildroot] [PATCH 03/17] hostapd: ensure hostapd binaries are installed in the right place llandwerlin at gmail.com
@ 2010-12-08 9:53 ` llandwerlin at gmail.com
2010-12-08 9:53 ` [Buildroot] [PATCH 05/17] ifplugd: ensure target directories " llandwerlin at gmail.com
` (12 subsequent siblings)
16 siblings, 0 replies; 30+ messages in thread
From: llandwerlin at gmail.com @ 2010-12-08 9:53 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/cloop/cloop.mk | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/package/cloop/cloop.mk b/package/cloop/cloop.mk
index 0ed9ff0..03008a4 100644
--- a/package/cloop/cloop.mk
+++ b/package/cloop/cloop.mk
@@ -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
--
1.7.2.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 05/17] ifplugd: ensure target directories exist before copying into
2010-12-08 9:53 [Buildroot] [pull request] For branch pre-package-generation-2011.02 llandwerlin at gmail.com
` (3 preceding siblings ...)
2010-12-08 9:53 ` [Buildroot] [PATCH 04/17] cloop: ensure target directory exist before copying into llandwerlin at gmail.com
@ 2010-12-08 9:53 ` llandwerlin at gmail.com
2010-12-12 22:59 ` Peter Korsgaard
2010-12-08 9:53 ` [Buildroot] [PATCH 06/17] i2c-tools: ensure binaries are installed in the right place llandwerlin at gmail.com
` (11 subsequent siblings)
16 siblings, 1 reply; 30+ messages in thread
From: llandwerlin at gmail.com @ 2010-12-08 9:53 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/ifplugd/ifplugd.mk | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/package/ifplugd/ifplugd.mk b/package/ifplugd/ifplugd.mk
index 5e66cea..0be903c 100644
--- a/package/ifplugd/ifplugd.mk
+++ b/package/ifplugd/ifplugd.mk
@@ -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 \
--
1.7.2.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 05/17] ifplugd: ensure target directories exist before copying into
2010-12-08 9:53 ` [Buildroot] [PATCH 05/17] ifplugd: ensure target directories " llandwerlin at gmail.com
@ 2010-12-12 22:59 ` Peter Korsgaard
0 siblings, 0 replies; 30+ messages in thread
From: Peter Korsgaard @ 2010-12-12 22:59 UTC (permalink / raw)
To: buildroot
>>>>> "llandwerlin" == llandwerlin <llandwerlin@gmail.com> writes:
llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
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?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 30+ messages in thread
* [Buildroot] [PATCH 06/17] i2c-tools: ensure binaries are installed in the right place
2010-12-08 9:53 [Buildroot] [pull request] For branch pre-package-generation-2011.02 llandwerlin at gmail.com
` (4 preceding siblings ...)
2010-12-08 9:53 ` [Buildroot] [PATCH 05/17] ifplugd: ensure target directories " llandwerlin at gmail.com
@ 2010-12-08 9:53 ` llandwerlin at gmail.com
2010-12-08 19:10 ` Thomas Petazzoni
2010-12-12 23:01 ` Peter Korsgaard
2010-12-08 9:53 ` [Buildroot] [PATCH 07/17] udev: ensure startup script is well installed llandwerlin at gmail.com
` (10 subsequent siblings)
16 siblings, 2 replies; 30+ messages in thread
From: llandwerlin at gmail.com @ 2010-12-08 9:53 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/i2c-tools/i2c-tools.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk
index d419524..2e60407 100644
--- a/package/i2c-tools/i2c-tools.mk
+++ b/package/i2c-tools/i2c-tools.mk
@@ -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
--
1.7.2.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 06/17] i2c-tools: ensure binaries are installed in the right place
2010-12-08 9:53 ` [Buildroot] [PATCH 06/17] i2c-tools: ensure binaries are installed in the right place llandwerlin at gmail.com
@ 2010-12-08 19:10 ` Thomas Petazzoni
2010-12-12 23:00 ` Peter Korsgaard
2010-12-12 23:01 ` Peter Korsgaard
1 sibling, 1 reply; 30+ messages in thread
From: Thomas Petazzoni @ 2010-12-08 19:10 UTC (permalink / raw)
To: buildroot
On Wed, 8 Dec 2010 10:53:58 +0100
llandwerlin at gmail.com wrote:
> define I2C_TOOLS_INSTALL_TARGET_CMDS
> + $(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
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 30+ messages in thread
* [Buildroot] [PATCH 06/17] i2c-tools: ensure binaries are installed in the right place
2010-12-08 19:10 ` Thomas Petazzoni
@ 2010-12-12 23:00 ` Peter Korsgaard
0 siblings, 0 replies; 30+ messages in thread
From: Peter Korsgaard @ 2010-12-12 23:00 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> On Wed, 8 Dec 2010 10:53:58 +0100
Thomas> llandwerlin at gmail.com wrote:
>> define I2C_TOOLS_INSTALL_TARGET_CMDS
>> + $(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).
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 30+ messages in thread
* [Buildroot] [PATCH 06/17] i2c-tools: ensure binaries are installed in the right place
2010-12-08 9:53 ` [Buildroot] [PATCH 06/17] i2c-tools: ensure binaries are installed in the right place llandwerlin at gmail.com
2010-12-08 19:10 ` Thomas Petazzoni
@ 2010-12-12 23:01 ` Peter Korsgaard
1 sibling, 0 replies; 30+ messages in thread
From: Peter Korsgaard @ 2010-12-12 23:01 UTC (permalink / raw)
To: buildroot
>>>>> "llandwerlin" == llandwerlin <llandwerlin@gmail.com> writes:
llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
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.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 30+ messages in thread
* [Buildroot] [PATCH 07/17] udev: ensure startup script is well installed
2010-12-08 9:53 [Buildroot] [pull request] For branch pre-package-generation-2011.02 llandwerlin at gmail.com
` (5 preceding siblings ...)
2010-12-08 9:53 ` [Buildroot] [PATCH 06/17] i2c-tools: ensure binaries are installed in the right place llandwerlin at gmail.com
@ 2010-12-08 9:53 ` llandwerlin at gmail.com
2010-12-08 9:54 ` [Buildroot] [PATCH 08/17] busybox: move udhcp script from skeleton to package llandwerlin at gmail.com
` (9 subsequent siblings)
16 siblings, 0 replies; 30+ messages in thread
From: llandwerlin at gmail.com @ 2010-12-08 9:53 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
In case /etc/init.d does not exists.
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/udev/udev.mk | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/package/udev/udev.mk b/package/udev/udev.mk
index 90dbdce..8da2798 100644
--- a/package/udev/udev.mk
+++ b/package/udev/udev.mk
@@ -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
--
1.7.2.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 08/17] busybox: move udhcp script from skeleton to package
2010-12-08 9:53 [Buildroot] [pull request] For branch pre-package-generation-2011.02 llandwerlin at gmail.com
` (6 preceding siblings ...)
2010-12-08 9:53 ` [Buildroot] [PATCH 07/17] udev: ensure startup script is well installed llandwerlin at gmail.com
@ 2010-12-08 9:54 ` llandwerlin at gmail.com
2010-12-08 19:12 ` Thomas Petazzoni
2010-12-08 9:54 ` [Buildroot] [PATCH 09/17] sdl_sound: avoid using non reevaluated $(STAGING_DIR) llandwerlin at gmail.com
` (8 subsequent siblings)
16 siblings, 1 reply; 30+ messages in thread
From: llandwerlin at gmail.com @ 2010-12-08 9:54 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
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
diff --git a/fs/skeleton/usr/share/udhcpc/default.script b/fs/skeleton/usr/share/udhcpc/default.script
deleted file mode 100755
index a52a7f8..0000000
--- a/fs/skeleton/usr/share/udhcpc/default.script
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# udhcpc script edited by Tim Riker <Tim@Rikers.org>
-
-[ -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
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index b7f4740..da391ba 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -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
diff --git a/package/busybox/udhcpc.script b/package/busybox/udhcpc.script
new file mode 100755
index 0000000..a52a7f8
--- /dev/null
+++ b/package/busybox/udhcpc.script
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# udhcpc script edited by Tim Riker <Tim@Rikers.org>
+
+[ -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
--
1.7.2.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 08/17] busybox: move udhcp script from skeleton to package
2010-12-08 9:54 ` [Buildroot] [PATCH 08/17] busybox: move udhcp script from skeleton to package llandwerlin at gmail.com
@ 2010-12-08 19:12 ` Thomas Petazzoni
2010-12-08 20:55 ` Lionel Landwerlin
0 siblings, 1 reply; 30+ messages in thread
From: Thomas Petazzoni @ 2010-12-08 19:12 UTC (permalink / raw)
To: buildroot
On Wed, 8 Dec 2010 10:54:00 +0100
llandwerlin at gmail.com wrote:
> From: Lionel Landwerlin <llandwerlin@gmail.com>
>
> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
> ---
> fs/skeleton/usr/share/udhcpc/default.script | 39 ---------------------------
> package/busybox/busybox.mk | 2 +-
> package/busybox/udhcpc.script | 39 +++++++++++++++++++++++++++
Why is this needed ?
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 30+ messages in thread
* [Buildroot] [PATCH 08/17] busybox: move udhcp script from skeleton to package
2010-12-08 19:12 ` Thomas Petazzoni
@ 2010-12-08 20:55 ` Lionel Landwerlin
2010-12-08 21:16 ` Thomas Petazzoni
2010-12-12 23:04 ` Peter Korsgaard
0 siblings, 2 replies; 30+ messages in thread
From: Lionel Landwerlin @ 2010-12-08 20:55 UTC (permalink / raw)
To: buildroot
Le mercredi 08 d?cembre 2010 ? 20:12 +0100, Thomas Petazzoni a ?crit :
> On Wed, 8 Dec 2010 10:54:00 +0100
> llandwerlin at gmail.com wrote:
>
> > From: Lionel Landwerlin <llandwerlin@gmail.com>
> >
> > Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
> > ---
> > 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
^ permalink raw reply [flat|nested] 30+ messages in thread
* [Buildroot] [PATCH 08/17] busybox: move udhcp script from skeleton to package
2010-12-08 20:55 ` Lionel Landwerlin
@ 2010-12-08 21:16 ` Thomas Petazzoni
2010-12-12 23:04 ` Peter Korsgaard
1 sibling, 0 replies; 30+ messages in thread
From: Thomas Petazzoni @ 2010-12-08 21:16 UTC (permalink / raw)
To: buildroot
On Wed, 08 Dec 2010 21:55:33 +0100
Lionel Landwerlin <llandwerlin@gmail.com> wrote:
> 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
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 30+ messages in thread
* [Buildroot] [PATCH 08/17] busybox: move udhcp script from skeleton to package
2010-12-08 20:55 ` Lionel Landwerlin
2010-12-08 21:16 ` Thomas Petazzoni
@ 2010-12-12 23:04 ` Peter Korsgaard
1 sibling, 0 replies; 30+ messages in thread
From: Peter Korsgaard @ 2010-12-12 23:04 UTC (permalink / raw)
To: buildroot
>>>>> "Lionel" == Lionel Landwerlin <llandwerlin@gmail.com> writes:
Lionel> Le mercredi 08 d?cembre 2010 ? 20:12 +0100, Thomas Petazzoni a ?crit :
>> On Wed, 8 Dec 2010 10:54:00 +0100
>> llandwerlin at gmail.com wrote:
>>
>> > From: Lionel Landwerlin <llandwerlin@gmail.com>
>> >
>> > Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
>> > ---
>> > 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.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 30+ messages in thread
* [Buildroot] [PATCH 09/17] sdl_sound: avoid using non reevaluated $(STAGING_DIR)
2010-12-08 9:53 [Buildroot] [pull request] For branch pre-package-generation-2011.02 llandwerlin at gmail.com
` (7 preceding siblings ...)
2010-12-08 9:54 ` [Buildroot] [PATCH 08/17] busybox: move udhcp script from skeleton to package llandwerlin at gmail.com
@ 2010-12-08 9:54 ` llandwerlin at gmail.com
2010-12-08 9:54 ` [Buildroot] [PATCH 10/17] sdl_gfx: " llandwerlin at gmail.com
` (7 subsequent siblings)
16 siblings, 0 replies; 30+ messages in thread
From: llandwerlin at gmail.com @ 2010-12-08 9:54 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/sdl_sound/sdl_sound.mk | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/package/sdl_sound/sdl_sound.mk b/package/sdl_sound/sdl_sound.mk
index bd94a62..6c45fcf 100644
--- a/package/sdl_sound/sdl_sound.mk
+++ b/package/sdl_sound/sdl_sound.mk
@@ -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)
--
1.7.2.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 10/17] sdl_gfx: avoid using non reevaluated $(STAGING_DIR)
2010-12-08 9:53 [Buildroot] [pull request] For branch pre-package-generation-2011.02 llandwerlin at gmail.com
` (8 preceding siblings ...)
2010-12-08 9:54 ` [Buildroot] [PATCH 09/17] sdl_sound: avoid using non reevaluated $(STAGING_DIR) llandwerlin at gmail.com
@ 2010-12-08 9:54 ` llandwerlin at gmail.com
2010-12-08 9:54 ` [Buildroot] [PATCH 11/17] cups: " llandwerlin at gmail.com
` (6 subsequent siblings)
16 siblings, 0 replies; 30+ messages in thread
From: llandwerlin at gmail.com @ 2010-12-08 9:54 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/sdl_gfx/sdl_gfx.mk | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/package/sdl_gfx/sdl_gfx.mk b/package/sdl_gfx/sdl_gfx.mk
index bd4e3f1..bbfd99f 100644
--- a/package/sdl_gfx/sdl_gfx.mk
+++ b/package/sdl_gfx/sdl_gfx.mk
@@ -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)
--
1.7.2.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 11/17] cups: avoid using non reevaluated $(STAGING_DIR)
2010-12-08 9:53 [Buildroot] [pull request] For branch pre-package-generation-2011.02 llandwerlin at gmail.com
` (9 preceding siblings ...)
2010-12-08 9:54 ` [Buildroot] [PATCH 10/17] sdl_gfx: " llandwerlin at gmail.com
@ 2010-12-08 9:54 ` llandwerlin at gmail.com
2010-12-08 9:54 ` [Buildroot] [PATCH 12/17] rsync: avoid using non reevaluated $(TARGET_DIR) in RSYNC_INSTALL_TARGET_OPT llandwerlin at gmail.com
` (5 subsequent siblings)
16 siblings, 0 replies; 30+ messages in thread
From: llandwerlin at gmail.com @ 2010-12-08 9:54 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/cups/cups.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index 776fb57..169cdb3 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -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)
--
1.7.2.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 12/17] rsync: avoid using non reevaluated $(TARGET_DIR) in RSYNC_INSTALL_TARGET_OPT
2010-12-08 9:53 [Buildroot] [pull request] For branch pre-package-generation-2011.02 llandwerlin at gmail.com
` (10 preceding siblings ...)
2010-12-08 9:54 ` [Buildroot] [PATCH 11/17] cups: " llandwerlin at gmail.com
@ 2010-12-08 9:54 ` llandwerlin at gmail.com
2010-12-08 9:54 ` [Buildroot] [PATCH 13/17] gdk-pixbuf: ensure startup script is well installed llandwerlin at gmail.com
` (4 subsequent siblings)
16 siblings, 0 replies; 30+ messages in thread
From: llandwerlin at gmail.com @ 2010-12-08 9:54 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/rsync/rsync.mk | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk
index e1bb28e..5ffbfbb 100644
--- a/package/rsync/rsync.mk
+++ b/package/rsync/rsync.mk
@@ -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))
--
1.7.2.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 13/17] gdk-pixbuf: ensure startup script is well installed
2010-12-08 9:53 [Buildroot] [pull request] For branch pre-package-generation-2011.02 llandwerlin at gmail.com
` (11 preceding siblings ...)
2010-12-08 9:54 ` [Buildroot] [PATCH 12/17] rsync: avoid using non reevaluated $(TARGET_DIR) in RSYNC_INSTALL_TARGET_OPT llandwerlin at gmail.com
@ 2010-12-08 9:54 ` llandwerlin at gmail.com
2010-12-08 9:54 ` [Buildroot] [PATCH 14/17] pango: " llandwerlin at gmail.com
` (3 subsequent siblings)
16 siblings, 0 replies; 30+ messages in thread
From: llandwerlin at gmail.com @ 2010-12-08 9:54 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
In case /etc/init.d does not exist.
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/gdk-pixbuf/gdk-pixbuf.mk | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
index f129e46..beba138 100644
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -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
--
1.7.2.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 14/17] pango: ensure startup script is well installed
2010-12-08 9:53 [Buildroot] [pull request] For branch pre-package-generation-2011.02 llandwerlin at gmail.com
` (12 preceding siblings ...)
2010-12-08 9:54 ` [Buildroot] [PATCH 13/17] gdk-pixbuf: ensure startup script is well installed llandwerlin at gmail.com
@ 2010-12-08 9:54 ` llandwerlin at gmail.com
2010-12-08 19:13 ` Thomas Petazzoni
2010-12-08 9:54 ` [Buildroot] [PATCH 15/17] at: " llandwerlin at gmail.com
` (2 subsequent siblings)
16 siblings, 1 reply; 30+ messages in thread
From: llandwerlin at gmail.com @ 2010-12-08 9:54 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
In case /etc/init.d does not exist.
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/pango/pango.mk | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index 373eb8b..a350f92 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -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
--
1.7.2.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 14/17] pango: ensure startup script is well installed
2010-12-08 9:54 ` [Buildroot] [PATCH 14/17] pango: " llandwerlin at gmail.com
@ 2010-12-08 19:13 ` Thomas Petazzoni
0 siblings, 0 replies; 30+ messages in thread
From: Thomas Petazzoni @ 2010-12-08 19:13 UTC (permalink / raw)
To: buildroot
On Wed, 8 Dec 2010 10:54:06 +0100
llandwerlin at gmail.com wrote:
> 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
We could also do it in one line:
$(INSTALL) -m 755 -D package/pango/S25pango $(TARGET_DIR)/etc/init.d/S25pango
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 30+ messages in thread
* [Buildroot] [PATCH 15/17] at: ensure startup script is well installed
2010-12-08 9:53 [Buildroot] [pull request] For branch pre-package-generation-2011.02 llandwerlin at gmail.com
` (13 preceding siblings ...)
2010-12-08 9:54 ` [Buildroot] [PATCH 14/17] pango: " llandwerlin at gmail.com
@ 2010-12-08 9:54 ` llandwerlin at gmail.com
2010-12-08 9:54 ` [Buildroot] [PATCH 16/17] bzip2: ensure target directories exist before copying into llandwerlin at gmail.com
2010-12-08 9:54 ` [Buildroot] [PATCH 17/17] directfb-examples: rework target installation rule to match package infrastructure llandwerlin at gmail.com
16 siblings, 0 replies; 30+ messages in thread
From: llandwerlin at gmail.com @ 2010-12-08 9:54 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
In case /etc/init.d does not exist.
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/at/at.mk | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/package/at/at.mk b/package/at/at.mk
index c38c424..531cb40 100644
--- a/package/at/at.mk
+++ b/package/at/at.mk
@@ -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
--
1.7.2.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 16/17] bzip2: ensure target directories exist before copying into
2010-12-08 9:53 [Buildroot] [pull request] For branch pre-package-generation-2011.02 llandwerlin at gmail.com
` (14 preceding siblings ...)
2010-12-08 9:54 ` [Buildroot] [PATCH 15/17] at: " llandwerlin at gmail.com
@ 2010-12-08 9:54 ` llandwerlin at gmail.com
2010-12-12 23:08 ` Peter Korsgaard
2010-12-08 9:54 ` [Buildroot] [PATCH 17/17] directfb-examples: rework target installation rule to match package infrastructure llandwerlin at gmail.com
16 siblings, 1 reply; 30+ messages in thread
From: llandwerlin at gmail.com @ 2010-12-08 9:54 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Also simply installation rules a little
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/bzip2/bzip2.mk | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk
index 3f341ee..38bb461 100644
--- a/package/bzip2/bzip2.mk
+++ b/package/bzip2/bzip2.mk
@@ -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/
--
1.7.2.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* [Buildroot] [PATCH 16/17] bzip2: ensure target directories exist before copying into
2010-12-08 9:54 ` [Buildroot] [PATCH 16/17] bzip2: ensure target directories exist before copying into llandwerlin at gmail.com
@ 2010-12-12 23:08 ` Peter Korsgaard
0 siblings, 0 replies; 30+ messages in thread
From: Peter Korsgaard @ 2010-12-12 23:08 UTC (permalink / raw)
To: buildroot
>>>>> "llandwerlin" == llandwerlin <llandwerlin@gmail.com> writes:
llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
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)
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 30+ messages in thread
* [Buildroot] [PATCH 17/17] directfb-examples: rework target installation rule to match package infrastructure
2010-12-08 9:53 [Buildroot] [pull request] For branch pre-package-generation-2011.02 llandwerlin at gmail.com
` (15 preceding siblings ...)
2010-12-08 9:54 ` [Buildroot] [PATCH 16/17] bzip2: ensure target directories exist before copying into llandwerlin at gmail.com
@ 2010-12-08 9:54 ` llandwerlin at gmail.com
16 siblings, 0 replies; 30+ messages in thread
From: llandwerlin at gmail.com @ 2010-12-08 9:54 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/directfb-examples/directfb-examples.mk | 111 ++++++++++++------------
1 files changed, 56 insertions(+), 55 deletions(-)
diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk
index 065f720..aed9790 100644
--- a/package/directfb-examples/directfb-examples.mk
+++ b/package/directfb-examples/directfb-examples.mk
@@ -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))
--
1.7.2.3
^ permalink raw reply related [flat|nested] 30+ messages in thread