diff options
| -rw-r--r-- | conf/machine/tosa.conf | 4 | ||||
| -rw-r--r-- | packages/unionfs/unionfs-modules.inc | 18 | ||||
| -rw-r--r-- | packages/unionfs/unionfs-modules_1.0.7.bb | 2 | ||||
| -rw-r--r-- | packages/unionfs/unionfs-utils_1.0.7.bb | 4 | ||||
| -rw-r--r-- | packages/unionfs/unionfs.inc | 2 |
5 files changed, 23 insertions, 7 deletions
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index 7396fe7d80..e92e026f20 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -6,10 +6,10 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm ${MACHINE}" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" -BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support chkhinge usbutils" +BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support usbutils" BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils kernel-module-acm kernel-module-evdev kernel-module-net-fd \ kernel-module-pxa-bi kernel-module-registers kernel-module-storage-fd kernel-module-usb-ohci-tc6393 kernel-module-usb-storage \ -kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support kernel-module-pxa-bi modutils chkhinge kernel-module-ip-gre \ +kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support kernel-module-pxa-bi modutils kernel-module-ip-gre \ kernel-module-irnet kernel-module-ipip kernel-module-usbcore kernel-module-usbdcore kernel-module-usbdmonitor" RRECOMMENDS += "kernel-module-usbdserial kernel-module-usbkbd kernel-module-usbmouse kernel-module-hid usbutils kernel-module-evdev" diff --git a/packages/unionfs/unionfs-modules.inc b/packages/unionfs/unionfs-modules.inc index ab7852a2c8..9083e4519c 100644 --- a/packages/unionfs/unionfs-modules.inc +++ b/packages/unionfs/unionfs-modules.inc @@ -2,15 +2,27 @@ unionutils = "unionctl uniondbg" include unionfs.inc inherit module -CFLAGS =+ "-D__KERNEL__ -DMODULE -I${STAGING_KERNEL_DIR}/include" + EXTRA_OEMAKE = "'CC=${KERNEL_CC}' 'LD=${KERNEL_LD}' \ 'KERNELVER=${KERNEL_VERSION}' \ 'LINUXSRC=${STAGING_KERNEL_DIR}' \ 'CROSS_COMPILE=${TARGET_PREFIX}' \ - 'OS=${TARGET_OS}'" + 'OS=${TARGET_OS}' \ + ${@get_flags(d, bb)}" + +KCFLAGS = "-D__KERNEL__ -DMODULE -DFISTGEN \ + -DUNIONFS_UNSUPPORTED -DNODEBUG \ + -I. -I${STAGING_KERNEL_DIR}/include \ + ${CFLAGS}" + +def get_flags(d, bb): + ret = "" + if bb.data.getVar('KERNEL_OBJECT_SUFFIX', d, 1) == '.ko': + return "'EXTRA_CFLAGS=%s'" % bb.data.getVar('KCFLAGS', d, 1) + return "'CFLAGS=%s'" % bb.data.getVar('KCFLAGS', d, 1) do_compile () { - unset CFLAGS LDFLAGS + unset LDFLAGS oe_runmake unionfs${KERNEL_OBJECT_SUFFIX} } diff --git a/packages/unionfs/unionfs-modules_1.0.7.bb b/packages/unionfs/unionfs-modules_1.0.7.bb index 1c702489d6..ff5e37819a 100644 --- a/packages/unionfs/unionfs-modules_1.0.7.bb +++ b/packages/unionfs/unionfs-modules_1.0.7.bb @@ -1,4 +1,4 @@ include unionfs-modules.inc include unionfs_${PV}.inc -PR = "r2" +PR = "r3" diff --git a/packages/unionfs/unionfs-utils_1.0.7.bb b/packages/unionfs/unionfs-utils_1.0.7.bb index e69de29bb2..8d97fc7466 100644 --- a/packages/unionfs/unionfs-utils_1.0.7.bb +++ b/packages/unionfs/unionfs-utils_1.0.7.bb @@ -0,0 +1,4 @@ +include unionfs-utils.inc +include unionfs_${PV}.inc + +PR = "r3" diff --git a/packages/unionfs/unionfs.inc b/packages/unionfs/unionfs.inc index ffd4f4c0e1..392a1cdaf5 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}" +export UCFLAGS := "${CFLAGS} -DNODEBUG" CFLAGS = "${BUILD_OPTIMIZATION}" |