From 93f365c0c3fa4a4b1ca945c63fff8534b1c9508c Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Sun, 30 Mar 2008 22:20:05 +0000
Subject: zaurus-updater: Teach do_deploy about packaged staging

---
 packages/zaurus-updater/zaurus-updater.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb
index 052560dcc9..56f067cbf7 100644
--- a/packages/zaurus-updater/zaurus-updater.bb
+++ b/packages/zaurus-updater/zaurus-updater.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
 DEPENDS = "encdec-updater-native"
 LICENSE = "zaurus-updater"
-PR = "r20"
+PR = "r21"
 
 PACKAGES = ""
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -22,10 +22,12 @@ do_compile() {
 do_deploy() {
 	install -d ${DEPLOY_DIR_IMAGE}
 	install -m 0755 updater.sh ${DEPLOY_DIR_IMAGE}/updater.sh.${MACHINE}
+        package_stagefile_shell ${DEPLOY_DIR_IMAGE}/updater.sh.${MACHINE}
 
 	case ${MACHINE} in
 		spitz )
 			install -m 0755 gnu-tar ${DEPLOY_DIR_IMAGE}/gnu-tar
+		        package_stagefile_shell ${DEPLOY_DIR_IMAGE}/gnu-tar
 			;;
         	*)
 			;;
-- 
cgit v1.2.3


From 71e8456ea2160f4874b31f49999dc4befda80a16 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 31 Mar 2008 08:29:57 +0000
Subject: abiword: add 2.6.0, latest stable

---
 packages/abiword/abiword_2.6.0.bb | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 packages/abiword/abiword_2.6.0.bb

(limited to 'packages')

diff --git a/packages/abiword/abiword_2.6.0.bb b/packages/abiword/abiword_2.6.0.bb
new file mode 100644
index 0000000000..e2db4a09cb
--- /dev/null
+++ b/packages/abiword/abiword_2.6.0.bb
@@ -0,0 +1,3 @@
+require abiword-2.5.inc
+
+RCONFLICTS = "abiword-embedded"
-- 
cgit v1.2.3


From 0771406832d8d0951c50dd9a07aa05ef4bd05965 Mon Sep 17 00:00:00 2001
From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Mon, 31 Mar 2008 08:32:59 +0000
Subject: =?UTF-8?q?kernel.bbclass,linux.inc:=20cleanup=20definition=20of?=
 =?UTF-8?q?=20${KERNEL=5FIMAGE=5FBASE=5FNAME}=20*=20drop=20${DATETIME}=20f?=
 =?UTF-8?q?rom=20${KERNEL=5FIMAGE=5FBASE=5FNAME}=20in=20kernel.bbclass,=20?=
 =?UTF-8?q?see:=20=20=20http://lists.linuxtogo.org/pipermail/openembedded-?=
 =?UTF-8?q?devel/2008-March/005017.html=20*=20make=20${KERNEL=5FIMAGE=5FBA?=
 =?UTF-8?q?SE=5FNAME}=20and=20${KERNEL=5FIMAGE=5FSYMLINK=5FNAME}=20=3F=3D,?=
 =?UTF-8?q?=20see:=20=20=20http://lists.linuxtogo.org/pipermail/openembedd?=
 =?UTF-8?q?ed-devel/2008-March/005016.html=20*=20remove=20${KERNEL=5FIMAGE?=
 =?UTF-8?q?=5FBASE=5FNAME}=20and=20${KERNEL=5FIMAGE=5FSYMLINK=5FNAME}=20fr?=
 =?UTF-8?q?om=20linux.inc=20*=20use=20${KERNEL=5FIMAGE=5FBASE=5FNAME}?=
 =?UTF-8?q?=C2=A0for=20uImage=20deploy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/linux/linux.inc | 2 --
 1 file changed, 2 deletions(-)

(limited to 'packages')

diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index ad7071c405..f5049b1d26 100644
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -106,5 +106,3 @@ do_compile_append() {
     fi
 }
 
-KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}"
-KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}"
-- 
cgit v1.2.3


From b120059dccc4285757586f0969955b4c298daefd Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 31 Mar 2008 08:42:50 +0000
Subject: abiword-plugins 2.5.x: unbreak configure by fixing DESCRIPTION

---
 packages/abiword/abiword-plugins_2.5.1.bb | 2 +-
 packages/abiword/abiword-plugins_2.5.2.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/abiword/abiword-plugins_2.5.1.bb b/packages/abiword/abiword-plugins_2.5.1.bb
index ec11982ad7..eb626aba91 100644
--- a/packages/abiword/abiword-plugins_2.5.1.bb
+++ b/packages/abiword/abiword-plugins_2.5.1.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word""
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"
 HOMEPAGE = "http://www.abiword.org"
 SECTION = "x11/office"
 LICENSE = "GPLv2"
diff --git a/packages/abiword/abiword-plugins_2.5.2.bb b/packages/abiword/abiword-plugins_2.5.2.bb
index d750bf539d..89a0527401 100644
--- a/packages/abiword/abiword-plugins_2.5.2.bb
+++ b/packages/abiword/abiword-plugins_2.5.2.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word""
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"
 HOMEPAGE = "http://www.abiword.org"
 SECTION = "x11/office"
 LICENSE = "GPLv2"
-- 
cgit v1.2.3


From fea72465d5902d262c8771dded37f106b63993e3 Mon Sep 17 00:00:00 2001
From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Mon, 31 Mar 2008 09:26:15 +0000
Subject: linux.inc: move binary devicetree generation to linux.inc

---
 packages/linux/linux-rt_2.6.24.bb         | 17 -----------------
 packages/linux/linux.inc                  | 20 ++++++++++++++++++++
 packages/linux/linux_2.6.23+2.6.24-rc5.bb | 12 +-----------
 packages/linux/linux_2.6.23.bb            | 17 -----------------
 packages/linux/linux_2.6.24.bb            | 15 ---------------
 5 files changed, 21 insertions(+), 60 deletions(-)

(limited to 'packages')

diff --git a/packages/linux/linux-rt_2.6.24.bb b/packages/linux/linux-rt_2.6.24.bb
index 8081f44e93..bddb16fdf0 100644
--- a/packages/linux/linux-rt_2.6.24.bb
+++ b/packages/linux/linux-rt_2.6.24.bb
@@ -4,8 +4,6 @@ require linux.inc
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
 
-DEPENDS_append_mpc8313e-rdb = " dtc-native"
-
 PR = "r3"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.3.tar.bz2 \
@@ -24,18 +22,3 @@ SRC_URI_append_mpc8313e-rdb = "\
 #	file://mpc831x-nand.patch;patch=1 \
 #	file://mpc8313e-rdb-rtc.patch;patch=1 "
 
-DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
-DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000"
-
-do_devicetree_image() {
-        if test -n "${DEVICETREE}" ; then
-            dtc -I dts -O dtb ${DEVICETREE_FLAGS} -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE}
-
-            cd ${DEPLOY_DIR_IMAGE}
-            rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-            ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-        fi
-}
-
-addtask devicetree_image after do_deploy before do_package
-
diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index f5049b1d26..1f6eeb5538 100644
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -18,6 +18,15 @@ CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=/dev/mmcblk0p1 rootfs
 CMDLINE_DEBUG ?= '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'
 CMDLINE_append = " ${CMDLINE_DEBUG} "
 
+# Support for binary device tree generation
+
+KERNEL_DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
+KERNEL_DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000"
+KERNEL_DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts"
+
+DEPENDS_append_mpc8313e-rdb = " dtc-native"
+DEPENDS_append_mpc8323e-rdb = " dtc-native"
+
 do_configure_prepend() {
         echo "" > ${S}/.config
 
@@ -106,3 +115,14 @@ do_compile_append() {
     fi
 }
 
+do_devicetree_image() {
+        if test -n "${KERNEL_DEVICETREE}" ; then
+            dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_DEVICETREE}
+
+            cd ${DEPLOY_DIR_IMAGE}
+            rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
+            ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
+        fi
+}
+
+addtask devicetree_image after do_deploy before do_package
diff --git a/packages/linux/linux_2.6.23+2.6.24-rc5.bb b/packages/linux/linux_2.6.23+2.6.24-rc5.bb
index 20ee7d0508..648fe6b756 100644
--- a/packages/linux/linux_2.6.23+2.6.24-rc5.bb
+++ b/packages/linux/linux_2.6.23+2.6.24-rc5.bb
@@ -64,15 +64,5 @@ python do_compulab_image() {
 	    os.symlink(img_file, link_file)
 }
 
-do_devicetree_image() {
-        if test -n "${DEVICETREE}" ; then
-            dtc -I dts -O dtb -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE}
-
-            cd ${DEPLOY_DIR_IMAGE}
-            rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-            ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-        fi
-}
-
 addtask compulab_image after do_deploy before do_package
-addtask devicetree_image after do_deploy before do_package
+
diff --git a/packages/linux/linux_2.6.23.bb b/packages/linux/linux_2.6.23.bb
index d3989a42ef..76ebbbe917 100644
--- a/packages/linux/linux_2.6.23.bb
+++ b/packages/linux/linux_2.6.23.bb
@@ -6,9 +6,6 @@ DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
 DEFAULT_PREFERENCE_mpc8323e-rdb = "1"
 DEFAULT_PREFERENCE_avr32 = "1"
 
-DEPENDS_append_mpc8313e-rdb = " dtc-native"
-DEPENDS_append_mpc8323e-rdb = " dtc-native"
-
 PR = "r12"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
@@ -52,10 +49,6 @@ SRC_URI_append_mpc8323e-rdb = "\
 
 CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"
 
-DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
-DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts"
-DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000"
-
 FILES_kernel-image_cm-x270 = ""
 
 python do_compulab_image() {
@@ -93,16 +86,6 @@ python do_compulab_image() {
 	    os.symlink(img_file, link_file)
 }
 
-do_devicetree_image() {
-        if test -n "${DEVICETREE}" ; then
-            dtc -I dts -O dtb ${DEVICETREE_FLAGS} -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE}
-
-            cd ${DEPLOY_DIR_IMAGE}
-            rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-            ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-        fi
-}
 
 addtask compulab_image after do_deploy before do_package
-addtask devicetree_image after do_deploy before do_package
 
diff --git a/packages/linux/linux_2.6.24.bb b/packages/linux/linux_2.6.24.bb
index c0751634a5..fa255403e9 100644
--- a/packages/linux/linux_2.6.24.bb
+++ b/packages/linux/linux_2.6.24.bb
@@ -10,8 +10,6 @@ DEFAULT_PREFERENCE_atngw100 = "1"
 DEFAULT_PREFERENCE_at32stk1000 = "1"
 DEFAULT_PREFERENCE_ts72xx = "1"
 
-DEPENDS_append_mpc8313e-rdb = " dtc-native"
-
 PR = "r11"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
@@ -84,8 +82,6 @@ CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=1 mem=64M
 
 FILES_kernel-image_gesbc-9302 = ""
 
-DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
-DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000"
 python do_compulab_image() {
 	import os
 	import os.path
@@ -122,16 +118,5 @@ python do_compulab_image() {
 }
 
 
-do_devicetree_image() {
-        if test -n "${DEVICETREE}" ; then
-            dtc -I dts -O dtb ${DEVICETREE_FLAGS} -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE}
-
-            cd ${DEPLOY_DIR_IMAGE}
-            rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-            ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-        fi
-}
-
 addtask compulab_image after do_deploy before do_package
-addtask devicetree_image after do_deploy before do_package
 
-- 
cgit v1.2.3


From 15b87148d7d597c9fd213f95471b5c6ffb293d38 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 31 Mar 2008 09:47:16 +0000
Subject: abiword-plugins: add latest stable, 2.6.0 and patch it to use CXX for
 LD

---
 packages/abiword/abiword-plugins_2.6.0.bb          | 44 ++++++++++++++++++++++
 .../abiword/files/abiword-cxx-for-ld-fix.patch     | 12 ++++++
 2 files changed, 56 insertions(+)
 create mode 100644 packages/abiword/abiword-plugins_2.6.0.bb
 create mode 100644 packages/abiword/files/abiword-cxx-for-ld-fix.patch

(limited to 'packages')

diff --git a/packages/abiword/abiword-plugins_2.6.0.bb b/packages/abiword/abiword-plugins_2.6.0.bb
new file mode 100644
index 0000000000..f6cdcc56b0
--- /dev/null
+++ b/packages/abiword/abiword-plugins_2.6.0.bb
@@ -0,0 +1,44 @@
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"
+HOMEPAGE = "http://www.abiword.org"
+SECTION = "x11/office"
+LICENSE = "GPLv2"
+DEPENDS = "boost loudmouth libwpd librsvg goffice poppler libglade"
+RDEPENDS = "abiword"
+
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz \
+           http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
+           file://abiword-cxx-for-ld-fix.patch;patch=1 \
+	   "
+
+DEFAULT_PREFERENCE = "2"
+
+inherit autotools
+
+PARALLEL_MAKE=""
+
+# Ugly hack to find libstdc++
+export LD="${CXX}"
+
+EXTRA_OECONF = " --without-libwmf \
+                 --without-inter7eps \
+		 --with-abiword=${WORKDIR}/abiword-${PV} \
+		 --with-boost=${STAGING_DIR_HOST} \ 
+		 --with-boost-thread=boost_thread-mt \
+               "
+
+PACKAGES_DYNAMIC = "abiword-plugin-*"
+
+python populate_packages_prepend () {
+	abiword_libdir    = bb.data.expand('${libdir}/abiword-2.6/plugins', d)
+	do_split_packages(d, abiword_libdir, '^libAbi(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='')
+        do_split_packages(d, abiword_libdir, '^libAbi(.*)\.la$', 'abiword-plugin-%s-dev', 'Abiword plugin for %s', extra_depends='')
+}
+
+
+PACKAGES =+ "abiword-plugin-collab-glade"
+
+FILES_abiword-plugin-collab-glade += "${datadir}"
+RDEPENDS_abiword-plugin-collab-glade = "abiword-plugin-collab"
+
+FILES_${PN}-dbg += "${libdir}/abiword-2.6/plugins/.debug"
+
diff --git a/packages/abiword/files/abiword-cxx-for-ld-fix.patch b/packages/abiword/files/abiword-cxx-for-ld-fix.patch
new file mode 100644
index 0000000000..e49b1e92e5
--- /dev/null
+++ b/packages/abiword/files/abiword-cxx-for-ld-fix.patch
@@ -0,0 +1,12 @@
+libstc++ isn't in staging anymore, so we must use g++ for linking
+
+--- /tmp/configure.ac	2008-03-31 11:39:13.130631737 +0200
++++ abiword-plugins-2.6.0/configure.ac	2008-03-31 11:39:22.754586487 +0200
+@@ -14,6 +14,7 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
++AC_LANG_CPLUSPLUS
+ 
+ AM_INIT_AUTOMAKE
+ 
-- 
cgit v1.2.3


From 80b1d5fe7b58c66f8a1b05edd2967cadfd9a1984 Mon Sep 17 00:00:00 2001
From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Mon, 31 Mar 2008 11:54:48 +0000
Subject: linux.inc: add dtc-native to DEPENDS if KERNEL_DEVICETREE is defined

---
 packages/linux/linux.inc | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index 1f6eeb5538..2757ad520d 100644
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -24,8 +24,16 @@ KERNEL_DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
 KERNEL_DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000"
 KERNEL_DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts"
 
-DEPENDS_append_mpc8313e-rdb = " dtc-native"
-DEPENDS_append_mpc8323e-rdb = " dtc-native"
+python __anonymous () {
+
+    import bb
+    
+    devicetree = bb.data.getVar('KERNEL_DEVICETREE', d, 1) or ''
+    if devicetree:
+    	depends = bb.data.getVar("DEPENDS", d, 1)
+    	depends = "%s dtc-native" % depends
+    	bb.data.setVar("DEPENDS", depends, d)
+}
 
 do_configure_prepend() {
         echo "" > ${S}/.config
-- 
cgit v1.2.3


From f9302761ebe835b0059b73e104169837b31f5c14 Mon Sep 17 00:00:00 2001
From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Mon, 31 Mar 2008 14:41:29 +0000
Subject: hostap-daemon: replace version 0.6.0 by 0.6.3

---
 packages/hostap/hostap-daemon-0.6.0/.mtn2git_empty |  0
 packages/hostap/hostap-daemon-0.6.0/init           | 37 --------------------
 .../hostap/hostap-daemon-0.6.0/makefile-cross.diff | 25 --------------
 packages/hostap/hostap-daemon-0.6.3/.mtn2git_empty |  0
 packages/hostap/hostap-daemon-0.6.3/init           | 37 ++++++++++++++++++++
 .../hostap/hostap-daemon-0.6.3/makefile-cross.diff | 25 ++++++++++++++
 packages/hostap/hostap-daemon_0.6.0.bb             | 40 ----------------------
 packages/hostap/hostap-daemon_0.6.3.bb             | 40 ++++++++++++++++++++++
 8 files changed, 102 insertions(+), 102 deletions(-)
 delete mode 100644 packages/hostap/hostap-daemon-0.6.0/.mtn2git_empty
 delete mode 100644 packages/hostap/hostap-daemon-0.6.0/init
 delete mode 100644 packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff
 create mode 100644 packages/hostap/hostap-daemon-0.6.3/.mtn2git_empty
 create mode 100644 packages/hostap/hostap-daemon-0.6.3/init
 create mode 100644 packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff
 delete mode 100644 packages/hostap/hostap-daemon_0.6.0.bb
 create mode 100644 packages/hostap/hostap-daemon_0.6.3.bb

(limited to 'packages')

diff --git a/packages/hostap/hostap-daemon-0.6.0/.mtn2git_empty b/packages/hostap/hostap-daemon-0.6.0/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/hostap/hostap-daemon-0.6.0/init b/packages/hostap/hostap-daemon-0.6.0/init
deleted file mode 100644
index 79f74b681e..0000000000
--- a/packages/hostap/hostap-daemon-0.6.0/init
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-DAEMON=/usr/sbin/hostapd
-NAME=hostapd
-DESC="HOSTAP Daemon"
-ARGS="/etc/hostapd.conf -B"
-
-test -f $DAEMON || exit 0
-
-set -e
-
-case "$1" in
-    start)
-	echo -n "Starting $DESC: "
-	start-stop-daemon -S -x $DAEMON -- $ARGS
-	echo "$NAME."
-	;;
-    stop)
-	echo -n "Stopping $DESC: "
-	start-stop-daemon -K -x $DAEMON
-	echo "$NAME."
-	;;
-    restart)
-	$0 stop
-	$0 start
-	;;
-    reload)
-	echo -n "Reloading $DESC: "
-	killall -HUP $(basename ${DAEMON})
-	echo "$NAME."
-	;;
-    *)
-	echo "Usage: $0 {start|stop|restart|reload}"
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff b/packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff
deleted file mode 100644
index 9534199e78..0000000000
--- a/packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urN hostapd.orig/Makefile hostapd/Makefile
---- hostapd.orig/Makefile	2007-05-28 19:26:55.000000000 +0200
-+++ hostapd/Makefile	2007-11-22 16:28:44.000000000 +0100
-@@ -6,6 +6,8 @@
- CFLAGS = -MMD -O2 -Wall -g
- endif
- 
-+TARGET_PREFIX ?= /usr/local/bin/
-+
- # define HOSTAPD_DUMP_STATE to include SIGUSR1 handler for dumping state to
- # a file (undefine it, if you want to save in binary size)
- CFLAGS += -DHOSTAPD_DUMP_STATE
-@@ -361,10 +363,10 @@
- 	fi
- 
- install: all
--	for i in $(ALL); do cp $$i /usr/local/bin/$$i; done
-+	for i in $(ALL); do cp $$i $(TARGET_PREFIX)/$$i; done
- 
- hostapd: $(OBJS)
--	$(CC) -o hostapd $(OBJS) $(LIBS)
-+	$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
- 
- OBJS_c = hostapd_cli.o ../src/common/wpa_ctrl.o ../src/utils/os_$(CONFIG_OS).o
- hostapd_cli: $(OBJS_c)
diff --git a/packages/hostap/hostap-daemon-0.6.3/.mtn2git_empty b/packages/hostap/hostap-daemon-0.6.3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/hostap/hostap-daemon-0.6.3/init b/packages/hostap/hostap-daemon-0.6.3/init
new file mode 100644
index 0000000000..79f74b681e
--- /dev/null
+++ b/packages/hostap/hostap-daemon-0.6.3/init
@@ -0,0 +1,37 @@
+#!/bin/sh
+DAEMON=/usr/sbin/hostapd
+NAME=hostapd
+DESC="HOSTAP Daemon"
+ARGS="/etc/hostapd.conf -B"
+
+test -f $DAEMON || exit 0
+
+set -e
+
+case "$1" in
+    start)
+	echo -n "Starting $DESC: "
+	start-stop-daemon -S -x $DAEMON -- $ARGS
+	echo "$NAME."
+	;;
+    stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon -K -x $DAEMON
+	echo "$NAME."
+	;;
+    restart)
+	$0 stop
+	$0 start
+	;;
+    reload)
+	echo -n "Reloading $DESC: "
+	killall -HUP $(basename ${DAEMON})
+	echo "$NAME."
+	;;
+    *)
+	echo "Usage: $0 {start|stop|restart|reload}"
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff b/packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff
new file mode 100644
index 0000000000..9534199e78
--- /dev/null
+++ b/packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff
@@ -0,0 +1,25 @@
+diff -urN hostapd.orig/Makefile hostapd/Makefile
+--- hostapd.orig/Makefile	2007-05-28 19:26:55.000000000 +0200
++++ hostapd/Makefile	2007-11-22 16:28:44.000000000 +0100
+@@ -6,6 +6,8 @@
+ CFLAGS = -MMD -O2 -Wall -g
+ endif
+ 
++TARGET_PREFIX ?= /usr/local/bin/
++
+ # define HOSTAPD_DUMP_STATE to include SIGUSR1 handler for dumping state to
+ # a file (undefine it, if you want to save in binary size)
+ CFLAGS += -DHOSTAPD_DUMP_STATE
+@@ -361,10 +363,10 @@
+ 	fi
+ 
+ install: all
+-	for i in $(ALL); do cp $$i /usr/local/bin/$$i; done
++	for i in $(ALL); do cp $$i $(TARGET_PREFIX)/$$i; done
+ 
+ hostapd: $(OBJS)
+-	$(CC) -o hostapd $(OBJS) $(LIBS)
++	$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
+ 
+ OBJS_c = hostapd_cli.o ../src/common/wpa_ctrl.o ../src/utils/os_$(CONFIG_OS).o
+ hostapd_cli: $(OBJS_c)
diff --git a/packages/hostap/hostap-daemon_0.6.0.bb b/packages/hostap/hostap-daemon_0.6.0.bb
deleted file mode 100644
index 37b710db19..0000000000
--- a/packages/hostap/hostap-daemon_0.6.0.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-DESCRIPTION = "User space daemon for extended IEEE 802.11 management"
-HOMEPAGE = "http://hostap.epitest.fi"
-SECTION = "kernel/userland"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "openssl ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \
-	file://makefile-cross.diff;patch=1 \
-	file://defconfig \
-	file://init"
-
-S = "${WORKDIR}/hostapd-${PV}/hostapd"
-
-export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}"
-
-inherit update-rc.d
-INITSCRIPT_NAME=hostapd
-
-do_configure() {
-	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
-	if [ "x$HAS_PCI" == "x1" ] ; then
-		echo "CONFIG_DRIVER_MADWIFI=y" >> .config
-		echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config
-	fi
-}
-
-do_compile() {
-	CFLAGS='${CFLAGS}' CC='${CC}' make
-}
-
-do_install() {
-	install -d ${D}${sbindir} ${D}${sysconfdir}/init.d
-	make TARGET_PREFIX=${D}${sbindir} install
-	install -m 0644 hostapd.conf ${D}${sysconfdir}
-	install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd
-}
-
diff --git a/packages/hostap/hostap-daemon_0.6.3.bb b/packages/hostap/hostap-daemon_0.6.3.bb
new file mode 100644
index 0000000000..37b710db19
--- /dev/null
+++ b/packages/hostap/hostap-daemon_0.6.3.bb
@@ -0,0 +1,40 @@
+DESCRIPTION = "User space daemon for extended IEEE 802.11 management"
+HOMEPAGE = "http://hostap.epitest.fi"
+SECTION = "kernel/userland"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "openssl ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \
+	file://makefile-cross.diff;patch=1 \
+	file://defconfig \
+	file://init"
+
+S = "${WORKDIR}/hostapd-${PV}/hostapd"
+
+export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}"
+
+inherit update-rc.d
+INITSCRIPT_NAME=hostapd
+
+do_configure() {
+	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+	if [ "x$HAS_PCI" == "x1" ] ; then
+		echo "CONFIG_DRIVER_MADWIFI=y" >> .config
+		echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config
+	fi
+}
+
+do_compile() {
+	CFLAGS='${CFLAGS}' CC='${CC}' make
+}
+
+do_install() {
+	install -d ${D}${sbindir} ${D}${sysconfdir}/init.d
+	make TARGET_PREFIX=${D}${sbindir} install
+	install -m 0644 hostapd.conf ${D}${sysconfdir}
+	install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd
+}
+
-- 
cgit v1.2.3