summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-01-05 21:40:07 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-01-05 21:40:07 +0000
commit4d65a65822a0310c3d3420120ea62bbd837fe38b (patch)
treec42bedb7b2438820a1e4b1f7b0fc8f74c09eda30
parent3e91c29f501cca42113f2b8d53652defad86a113 (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/01/05 21:26:05+00:00 nexus.co.uk!pb add wavelan_cs to IPAQ_MODULES 2005/01/05 21:18:03+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/01/05 21:17:47+00:00 nexus.co.uk!pb update gpe-appmgr to 2.7 2005/01/05 15:59:41-05:00 handhelds.org!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into handhelds.org:/home/kergoth/code/openembedded 2005/01/05 15:59:28-05:00 handhelds.org!kergoth Add patches to remove the unnecessary inclusion of stropts.h from gpe-package-0.2 and gpe-shield-0.7. 2005/01/05 12:05:42-06:00 ti.com!kergoth Add unixbench 4.1.0 (The BYTE UNIX benchmarks). Currently the tests need to be run out of its source tree, so for now (ew) dumped its source tree directly into ${prefix}/src/unixbench-${PV}. BKrev: 41dc5eb7DUIaHkMPAYhuYiELmvNd7g
-rw-r--r--conf/machine/ipaq-common.conf2
-rw-r--r--packages/gpe-appmgr/gpe-appmgr_2.7.bb0
-rw-r--r--packages/gpe-package/gpe-package-0.2/nostropts.patch0
-rw-r--r--packages/gpe-package/gpe-package_0.2.bb4
-rw-r--r--packages/gpe-shield/gpe-shield-0.7/nostropts.patch0
-rw-r--r--packages/gpe-shield/gpe-shield_0.7.bb3
-rw-r--r--packages/unixbench/unixbench_4.1.0.bb0
7 files changed, 6 insertions, 3 deletions
diff --git a/conf/machine/ipaq-common.conf b/conf/machine/ipaq-common.conf
index 7758231431..f1a1458de1 100644
--- a/conf/machine/ipaq-common.conf
+++ b/conf/machine/ipaq-common.conf
@@ -1,4 +1,4 @@
-IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd pcmf502rd pcmf502re sa1100-rtc ipaq-hal h3600_ts usb-eth"
+IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd pcmf502rd pcmf502re sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs"
BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules mipv6"
BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules mipv6 ${@linux_module_packages('${IPAQ_MODULES}')}"
diff --git a/packages/gpe-appmgr/gpe-appmgr_2.7.bb b/packages/gpe-appmgr/gpe-appmgr_2.7.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpe-appmgr/gpe-appmgr_2.7.bb
diff --git a/packages/gpe-package/gpe-package-0.2/nostropts.patch b/packages/gpe-package/gpe-package-0.2/nostropts.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpe-package/gpe-package-0.2/nostropts.patch
diff --git a/packages/gpe-package/gpe-package_0.2.bb b/packages/gpe-package/gpe-package_0.2.bb
index 990570fe7e..c58ba4d4d3 100644
--- a/packages/gpe-package/gpe-package_0.2.bb
+++ b/packages/gpe-package/gpe-package_0.2.bb
@@ -1,4 +1,5 @@
LICENSE = "GPL"
+PR = "r1"
inherit gpe pkgconfig
DESCRIPTION = "A package manager GUI for GPE"
@@ -7,4 +8,5 @@ RDEPENDS = "gpe-icons"
SECTION = "gpe"
PRIORITY = "optional"
-SRC_URI += "file://use-filesel.patch;patch=1"
+SRC_URI += "file://use-filesel.patch;patch=1 \
+ file://nostropts.patch;patch=1"
diff --git a/packages/gpe-shield/gpe-shield-0.7/nostropts.patch b/packages/gpe-shield/gpe-shield-0.7/nostropts.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpe-shield/gpe-shield-0.7/nostropts.patch
diff --git a/packages/gpe-shield/gpe-shield_0.7.bb b/packages/gpe-shield/gpe-shield_0.7.bb
index 5146502f4f..fdce8c91c2 100644
--- a/packages/gpe-shield/gpe-shield_0.7.bb
+++ b/packages/gpe-shield/gpe-shield_0.7.bb
@@ -1,3 +1,4 @@
+PR = "r1"
inherit gpe pkgconfig
LICENSE = "GPL"
DEPENDS = "libgpewidget iptables"
@@ -6,4 +7,4 @@ SECTION = "gpe"
MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
DESCRIPTION = "GPE network security tool"
-
+SRC_URI += "file://nostropts.patch;patch=1"
diff --git a/packages/unixbench/unixbench_4.1.0.bb b/packages/unixbench/unixbench_4.1.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/unixbench/unixbench_4.1.0.bb