add unionfs modules and userland utilities 1.0.13

5 files changed, 20 insertions, 3 deletions

diff --git a/packages/unionfs/unionfs-modules.inc b/packages/unionfs/unionfs-modules.inc
index ceada47454..5e87288e48 100644
--- a/packages/unionfs/unionfs-modules.inc
+++ b/packages/unionfs/unionfs-modules.inc
@@ -3,6 +3,8 @@ unionutils = "unionctl uniondbg"
 include unionfs.inc
 inherit module
 
+SECTION = "kernel/modules"
+
 EXTRA_OEMAKE = "'CC=${KERNEL_CC}' 'LD=${KERNEL_LD}' \
 		'KERNELVER=${KERNEL_VERSION}' \
 		'LINUXSRC=${STAGING_KERNEL_DIR}' \
@@ -13,6 +15,7 @@ EXTRA_OEMAKE = "'CC=${KERNEL_CC}' 'LD=${KERNEL_LD}' \
 KCFLAGS = "-D__KERNEL__ -DMODULE -DFISTGEN \
 	   -DUNIONFS_UNSUPPORTED -DNODEBUG \
 	   -I. -I${STAGING_KERNEL_DIR}/include \
+           -DUNIONFS_VERSION=\"${PV}\" \
 	   ${CFLAGS}"
 
 def get_flags(d, bb):
diff --git a/packages/unionfs/unionfs-modules_1.0.13.bb b/packages/unionfs/unionfs-modules_1.0.13.bb
new file mode 100644
index 0000000000..2ff8ff588c
--- /dev/null
+++ b/packages/unionfs/unionfs-modules_1.0.13.bb
@@ -0,0 +1,9 @@
+PARALLEL_MAKE = ""
+
+include unionfs-modules.inc
+
+KERNEL_MAJMIN = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')[:3]}"
+
+do_compile() {
+	oe_runmake unionfs${KERNEL_MAJMIN}
+}
diff --git a/packages/unionfs/unionfs-utils.inc b/packages/unionfs/unionfs-utils.inc
index 18b3bc29cd..6620e91613 100644
--- a/packages/unionfs/unionfs-utils.inc
+++ b/packages/unionfs/unionfs-utils.inc
@@ -2,8 +2,7 @@ unionutils = "unionctl uniondbg"
 
 include unionfs.inc
 
-FILES_${PN} = "${sbindir}/unionctl"
-FILES_${PN}-dev = "${sbindir}/uniondbg"
+SECTION = "kernel/userland"
 
 do_compile () {
 	oe_runmake ${unionutils}
@@ -18,3 +17,7 @@ do_install () {
 		install -m 0644 man/$m.8 ${D}${mandir}/man8/ || exit 1
 	done
 }
+
+FILES_${PN} = "${sbindir}/unionctl"
+FILES_${PN}-dev = "${sbindir}/uniondbg"
+
diff --git a/packages/unionfs/unionfs-utils_1.0.13.bb b/packages/unionfs/unionfs-utils_1.0.13.bb
new file mode 100644
index 0000000000..be08882810
--- /dev/null
+++ b/packages/unionfs/unionfs-utils_1.0.13.bb
@@ -0,0 +1,2 @@
+include unionfs-utils.inc
+
diff --git a/packages/unionfs/unionfs.inc b/packages/unionfs/unionfs.inc
index 392a1cdaf5..72d4ed1fca 100644
--- a/packages/unionfs/unionfs.inc
+++ b/packages/unionfs/unionfs.inc
@@ -10,5 +10,5 @@ SRC_URI = "ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-${PV}.tar.gz \
 S = "${WORKDIR}/unionfs-${PV}"
 FILESPATH = "${FILE_DIRNAME}/unionfs-${PV}:${FILE_DIRNAME}/unionfs:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
 
-export UCFLAGS := "${CFLAGS} -DNODEBUG"
+export UCFLAGS = '${CFLAGS} -DNODEBUG -DUNIONFS_VERSION=\\"${PV}\\"'
 CFLAGS = "${BUILD_OPTIMIZATION}"