]> git.openpandora.org Git - openembedded.git/commitdiff
Merge bk://oe-devel.bkbits.net/openembedded
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>
Sun, 12 Jun 2005 11:40:10 +0000 (11:40 +0000)
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>
Sun, 12 Jun 2005 11:40:10 +0000 (11:40 +0000)
into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/12 11:50:57+01:00 reciva.com!pb
new xorg snapshot

2005/06/12 11:33:55+01:00 reciva.com!pb
second attempt at fixing the busybox environ thing

BKrev: 42ac1f1aoAopYvTGJJFaO61xPMc9hA

packages/busybox/busybox-1.00/ifupdown-spurious-environ.patch
packages/busybox/busybox_1.00.bb
packages/xserver/xserver-xorg_6.8.99.10.bb [new file with mode: 0644]

index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8753315f2c99ecb05e1ce0c906b5f907608d746d 100644 (file)
@@ -0,0 +1,12 @@
+--- busybox-1.00/networking/ifupdown.c.old     2005-06-11 19:51:59.000000000 +0100
++++ busybox-1.00/networking/ifupdown.c 2005-06-11 19:52:19.000000000 +0100
+@@ -148,6 +148,9 @@
+       struct mapping_defn_t *mappings;
+ };
+ 
++/* XXX */
++#define environ local_environ
++
+ static char no_act = 0;
+ static char verbose = 0;
+ static char **environ = NULL;
index 57fb359c1d749093a5f7df39c308579c198303d9..5588306f7046334b23e4ce4323263f6485ea7aeb 100644 (file)
@@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r24"
+PR = "r25"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://add-getkey-applet.patch;patch=1 \
@@ -28,6 +28,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://celf-ash-builtins.patch;patch=1 \
           file://dhcp-hostname.patch;patch=1 \
           file://gzip-spurious-const.patch;patch=1 \
+          file://ifupdown-spurious-environ.patch;patch=1 \
            file://defconfig \
            file://busybox-cron \
           file://busybox-httpd \
diff --git a/packages/xserver/xserver-xorg_6.8.99.10.bb b/packages/xserver/xserver-xorg_6.8.99.10.bb
new file mode 100644 (file)
index 0000000..e69de29