diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-06-12 11:40:10 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-06-12 11:40:10 +0000 |
| commit | b1b1ac8c71c8c3715c26aadf749a8c6831f7e693 (patch) | |
| tree | 78635b6133d792ed221b50c2a5192ab6bfb21b79 | |
| parent | 42fb5e07e908b84498f370eb194eee7559b0968a (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
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
| -rw-r--r-- | packages/busybox/busybox-1.00/ifupdown-spurious-environ.patch | 12 | ||||
| -rw-r--r-- | packages/busybox/busybox_1.00.bb | 3 | ||||
| -rw-r--r-- | packages/xserver/xserver-xorg_6.8.99.10.bb | 0 |
3 files changed, 14 insertions, 1 deletions
diff --git a/packages/busybox/busybox-1.00/ifupdown-spurious-environ.patch b/packages/busybox/busybox-1.00/ifupdown-spurious-environ.patch index e69de29bb2..8753315f2c 100644 --- a/packages/busybox/busybox-1.00/ifupdown-spurious-environ.patch +++ b/packages/busybox/busybox-1.00/ifupdown-spurious-environ.patch @@ -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; diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb index 57fb359c1d..5588306f70 100644 --- a/packages/busybox/busybox_1.00.bb +++ b/packages/busybox/busybox_1.00.bb @@ -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 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xserver/xserver-xorg_6.8.99.10.bb |