Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/30 19:19:11+00:00 nexus.co.uk!pb
add patch to make busybox fbset try both /dev/fb0 and /dev/fb/0 when compiled with devfs support

2004/12/30 18:50:56+00:00 nexus.co.uk!pb
apply patch from Florian Boor to correct gpe-aerial dependencies

2004/12/30 18:48:47+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2004/12/30 18:48:30+00:00 nexus.co.uk!pb
apply patch from Bob Davies to correct h3900 root entry in fstab

BKrev: 41d45997uPl6xQo9570qKKthAheN5g

diff --git a/packages/base-files/base-files/h3900/fstab b/packages/base-files/base-files/h3900/fstab
index e69de29..a47b05e 100644 (file)
--- a/packages/base-files/base-files/h3900/fstab
+++ b/packages/base-files/base-files/h3900/fstab
@@ -0,0 +1,6 @@
+/dev/mtdblock/1        /       jffs2   defaults        1  1 
+proc            /proc   proc    defaults        0  0
+/dev/hda1      /mnt/cf auto    defaults,noauto,noatime,user,exec,suid  0  0
+/dev/mmcda1    /mnt/card       auto    defaults,noauto,noatime,user,exec,suid  0  0
+tmpfs          /var    tmpfs   defaults        0  0
+tmpfs          /mnt/ram        tmpfs   defaults        0  0

diff --git a/packages/busybox/busybox-1.00/fbset.patch b/packages/busybox/busybox-1.00/fbset.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb
index 5fff6fc..528a32b 100644 (file)
--- a/packages/busybox/busybox_1.00.bb
+++ b/packages/busybox/busybox_1.00.bb
@@ -11,7 +11,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r12"
+PR = "r13"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://add-getkey-applet.patch;patch=1 \
@@ -24,6 +24,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
           file://iproute-flush-cache.patch;patch=1;pnum=0 \
           file://rmmod.patch;patch=1 \
           file://below.patch;patch=1 \
+          file://fbset.patch;patch=1 \
            file://defconfig \
            file://busybox-cron \
           file://busybox-httpd \

diff --git a/packages/gpe-aerial/gpe-aerial_0.2.11.bb b/packages/gpe-aerial/gpe-aerial_0.2.11.bb
index e69de29..543dc09 100644 (file)
--- a/packages/gpe-aerial/gpe-aerial_0.2.11.bb
+++ b/packages/gpe-aerial/gpe-aerial_0.2.11.bb
@@ -0,0 +1,12 @@
+inherit gpe pkgconfig
+
+PR = "r1"
+
+DESCRIPTION = "GPE wireless LAN communication applet"
+DEPENDS = "gtk+ libgpewidget prismstumbler"
+RDEPENDS = "prismstumbler"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+SRC_URI += "file://fix_makefile.patch;patch=1"