diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-16 03:40:07 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-16 03:40:07 +0000 |
| commit | f6f9de5ff9b4ff36fe43bfcead2a39727143de7d (patch) | |
| tree | f03d45ecc39bb4296096f7d3546598781cdf45ac /packages | |
| parent | faacf28771f7e370b89b98872f7c286434ee735e (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/01/15 22:33:49-05:00 handhelds.org!kergoth
Adjust the unionfs modules cflags.
2005/01/15 20:29:04-05:00 handhelds.org!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into handhelds.org:/home/kergoth/code/openembedded
2005/01/15 20:28:20-05:00 handhelds.org!kergoth
Remove the unnecessary 'chkhinge' from bootstrap on tosa.
2005/01/15 19:57:17-06:00 ti.com!kergoth
Adjust the unionfs build to add -DNODEBUG, which cuts the kernel module size in half.
BKrev: 41e9e217tUS1LC6e9u93oOrBAoAeMg
Diffstat (limited to 'packages')
| -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 |
4 files changed, 21 insertions, 5 deletions
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}" |