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

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

2005/02/23 12:40:33+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 12:36:37+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 11:34:13+01:00 mn-solutions.de!schurig
Merge http://oe-devel@openembedded.bkbits.net/openembedded
into mnz66.mn-solutions.de:/usr/src/oe/p

2005/02/23 11:33:31+01:00 mn-solutions.de!schurig
fix installation stage

2005/02/23 09:27:44+00:00 (none)!xora
New upstream version of kismet, fixes for compilation problems, and change of maintainer with Brunos permission

2005/02/23 01:11:25+01:00 uni-frankfurt.de!mickeyl
add a sharprom-compatible distro configuration. relies on an external 2.95.3 toolchain (for now... until someone adds it to OE) and needs further work. It's a start for someone interested though.

2005/02/23 01:09:23+01:00 uni-frankfurt.de!mickeyl
bump cvsdate on oz-3.5.3

2005/02/22 17:37:44-06:00 ti.com!kergoth
Fix the quilt PATCHCMD to stop rampantly chmod'ing, which made the CVS directories not executable, thereby screwing up the ability to rm -rf tmp.  Thanks to holger freyther for pointing it out.

BKrev: 421c7b62hBWfitoVhb3IO3ZT5nS71A

4 files changed, 29 insertions, 9 deletions

diff --git a/packages/unionfs/unionfs-modules.inc b/packages/unionfs/unionfs-modules.inc
index 327ac91e03..ceada47454 100644
--- a/packages/unionfs/unionfs-modules.inc
+++ b/packages/unionfs/unionfs-modules.inc
@@ -27,9 +27,9 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs
-	install -m 0644 unionfs${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs/
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs
+	install -m 0644 unionfs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs/
 
-	install -d ${D}/${mandir}/man4
-	install -m 0644 man/unionfs.4 ${D}/${mandir}/man4/
+	install -d ${D}${mandir}/man4
+	install -m 0644 man/unionfs.4 ${D}${mandir}/man4/
 }
diff --git a/packages/unionfs/unionfs-utils.inc b/packages/unionfs/unionfs-utils.inc
index e69de29bb2..18b3bc29cd 100644
--- a/packages/unionfs/unionfs-utils.inc
+++ b/packages/unionfs/unionfs-utils.inc
@@ -0,0 +1,20 @@
+unionutils = "unionctl uniondbg"
+
+include unionfs.inc
+
+FILES_${PN} = "${sbindir}/unionctl"
+FILES_${PN}-dev = "${sbindir}/uniondbg"
+
+do_compile () {
+	oe_runmake ${unionutils}
+}
+
+do_install () {
+	install -d ${D}${sbindir}
+	install -m 0755 ${unionutils} ${D}${sbindir}/
+
+	install -d ${D}${mandir}/man8
+	for m in ${unionutils}; do
+		install -m 0644 man/$m.8 ${D}${mandir}/man8/ || exit 1
+	done
+}
diff --git a/packages/unionfs/unionroot-utils_0.1.1.bb b/packages/unionfs/unionroot-utils_0.1.1.bb
index 4af7cd7ef4..4c2ed9ac53 100644
--- a/packages/unionfs/unionroot-utils_0.1.1.bb
+++ b/packages/unionfs/unionroot-utils_0.1.1.bb
@@ -11,9 +11,9 @@ SRC_URI = "file://mount.unionroot \
 	   file://umount.unionroot"
 
 do_install () {
-	install -d ${D}/${base_bindir}
-	install -m 0755 ${WORKDIR}/mount.unionroot ${D}/${base_bindir}/
-	install -m 0755 ${WORKDIR}/umount.unionroot ${D}/${base_bindir}/
+	install -d ${D}${base_bindir}
+	install -m 0755 ${WORKDIR}/mount.unionroot ${D}${base_bindir}/
+	install -m 0755 ${WORKDIR}/umount.unionroot ${D}${base_bindir}/
 }
 
 pkg_postinst () {
diff --git a/packages/unionfs/unionroot_0.1.1.bb b/packages/unionfs/unionroot_0.1.1.bb
index ba07cc1695..50109b47aa 100644
--- a/packages/unionfs/unionroot_0.1.1.bb
+++ b/packages/unionfs/unionroot_0.1.1.bb
@@ -17,8 +17,8 @@ ALTERNATIVE_PATH = "/sbin/init.unionroot"
 ALTERNATIVE_PRIORITY = "100"
 
 do_install () {
-        install -d ${D}/${base_sbindir}
-        install -m 0755 ${WORKDIR}/init.unionroot ${D}/${base_sbindir}/
+        install -d ${D}${base_sbindir}
+        install -m 0755 ${WORKDIR}/init.unionroot ${D}${base_sbindir}/
 }
 
 pkg_postinst () {