[oe-commits] org.oe.dev linux-efika: Moved from 2.6.20.11-cfs to .20.20-cfs. Needed div64_32() symbol weakening in lib.
likewise commit
openembedded-commits at lists.openembedded.org
Sun Oct 7 15:03:47 UTC 2007
linux-efika: Moved from 2.6.20.11-cfs to .20.20-cfs. Needed div64_32() symbol weakening in lib.
Author: likewise at openembedded.org
Branch: org.openembedded.dev
Revision: 0f87cfac5fccad575e5de64ae2f146a2937802d9
ViewMTN: http://monotone.openembedded.org/revision/info/0f87cfac5fccad575e5de64ae2f146a2937802d9
Files:
1
packages/linux/linux-efika-2.6.20.11
packages/linux/linux-efika-2.6.20.20
packages/linux/linux-efika_2.6.20.11.bb
packages/linux/linux-efika_2.6.20.20.bb
packages/linux/linux-efika-2.6.20.20/weaken-div64_32-symbol.patch
packages/linux/linux-efika-2.6.20/defconfig
Diffs:
#
# mt diff -r85247a2279ec070ff180162e46ddbdbf49eab3bd -r0f87cfac5fccad575e5de64ae2f146a2937802d9
#
#
#
# rename "packages/linux/linux-efika-2.6.20.11"
# to "packages/linux/linux-efika-2.6.20.20"
#
# rename "packages/linux/linux-efika_2.6.20.11.bb"
# to "packages/linux/linux-efika_2.6.20.20.bb"
#
# add_file "packages/linux/linux-efika-2.6.20.20/weaken-div64_32-symbol.patch"
# content [f60be9cc04e917dee20bd3c3c2312e1ec0670565]
#
# patch "packages/linux/linux-efika-2.6.20/defconfig"
# from [d182aa0b4cf4381f4273017275e6611f4f1eefb6]
# to [4469395364bee4cb298524d48db8950eb689222f]
#
# patch "packages/linux/linux-efika_2.6.20.20.bb"
# from [53022093ad12a60cc0933f2a6810354444e127ba]
# to [0913f4ac4c81c3bd6f01b0aa30e6dd882f270953]
#
============================================================
--- packages/linux/linux-efika-2.6.20.20/weaken-div64_32-symbol.patch f60be9cc04e917dee20bd3c3c2312e1ec0670565
+++ packages/linux/linux-efika-2.6.20.20/weaken-div64_32-symbol.patch f60be9cc04e917dee20bd3c3c2312e1ec0670565
@@ -0,0 +1,23 @@
+2.6.20.20 with CFS fails to compile for powerpc, because this arch already has
+its assembly-optimized __div64_32() implementation, so linking fails due to
+two symbols.
+
+The same issue appeared on the s390 arch, so this patch is inspired by it.
+
+http://lkml.org/lkml/2007/4/11/24
+
+Leon 'likewise' Woestenberg <leonw at mailcan.com>
+
+Index: linux-2.6.20/lib/div64.c
+===================================================================
+--- linux-2.6.20.orig/lib/div64.c 2007-10-07 16:19:38.000000000 +0200
++++ linux-2.6.20/lib/div64.c 2007-10-07 16:20:15.000000000 +0200
+@@ -23,7 +23,7 @@
+ /* Not needed on 64bit architectures */
+ #if BITS_PER_LONG == 32
+
+-uint32_t __div64_32(uint64_t *n, uint32_t base)
++uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
+ {
+ uint64_t rem = *n;
+ uint64_t b = base;
============================================================
--- packages/linux/linux-efika-2.6.20/defconfig d182aa0b4cf4381f4273017275e6611f4f1eefb6
+++ packages/linux/linux-efika-2.6.20/defconfig 4469395364bee4cb298524d48db8950eb689222f
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20.11-cfs-v9
-# Sun Oct 7 12:21:03 2007
+# Linux kernel version: 2.6.20.20-cfs-v22
+# Sun Oct 7 15:39:14 2007
#
# CONFIG_PPC64 is not set
CONFIG_PPC32=y
@@ -53,6 +53,7 @@ CONFIG_BROKEN_ON_SMP=y
#
CONFIG_EXPERIMENTAL=y
CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
#
@@ -69,6 +70,8 @@ CONFIG_POSIX_MQUEUE=y
# CONFIG_UTS_NS is not set
# CONFIG_AUDIT is not set
# CONFIG_IKCONFIG is not set
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_FAIR_USER_SCHED=y
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_RELAY is not set
CONFIG_INITRAMFS_SOURCE=""
@@ -165,9 +168,10 @@ CONFIG_HZ=1000
# CONFIG_HZ_300 is not set
CONFIG_HZ_1000=y
CONFIG_HZ=1000
-CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_NONE is not set
# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_BKL=y
CONFIG_BINFMT_ELF=y
CONFIG_BINFMT_MISC=y
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -186,8 +190,13 @@ CONFIG_CMDLINE="console=ttyS0,9600 conso
CONFIG_PROC_DEVICETREE=y
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="console=ttyS0,9600 console=ttyPSC0,115200"
-# CONFIG_PM is not set
-CONFIG_SECCOMP=y
+CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
+CONFIG_PM_DEBUG=y
+# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
+# CONFIG_PM_SYSFS_DEPRECATED is not set
+# CONFIG_SOFTWARE_SUSPEND is not set
+# CONFIG_SECCOMP is not set
CONFIG_ISA_DMA_API=y
#
@@ -1248,6 +1257,7 @@ CONFIG_USB_DYNAMIC_MINORS=y
CONFIG_USB_DEVICEFS=y
CONFIG_USB_BANDWIDTH=y
CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_SUSPEND is not set
# CONFIG_USB_OTG is not set
#
@@ -1291,7 +1301,6 @@ CONFIG_USB_STORAGE=y
# CONFIG_USB_STORAGE_SDDR55 is not set
# CONFIG_USB_STORAGE_JUMPSHOT is not set
# CONFIG_USB_STORAGE_ALAUDA is not set
-# CONFIG_USB_STORAGE_ONETOUCH is not set
# CONFIG_USB_STORAGE_KARMA is not set
# CONFIG_USB_LIBUSUAL is not set
============================================================
--- packages/linux/linux-efika_2.6.20.11.bb 53022093ad12a60cc0933f2a6810354444e127ba
+++ packages/linux/linux-efika_2.6.20.20.bb 0913f4ac4c81c3bd6f01b0aa30e6dd882f270953
@@ -41,12 +41,12 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux
file://0032-POWERPC-EFIKA-Adds-missing-interrupts-from-bestcomm-node.txt;p=1;patch=1 \
file://0033-EFIKA-fullduplex-prpl_aln.txt;p=1;patch=1 \
file://v4l.diff;p=1;patch=1 \
- http://www.kernel.org/pub/linux/kernel/v2.6/patch-2.6.20.11.bz2;p=1;patch=1 \
- file://sched-cfs-v9-v2.6.20.11.patch;p=1;patch=1 \
+ http://www.kernel.org/pub/linux/kernel/v2.6/patch-2.6.20.20.bz2;p=1;patch=1 \
+ http://people.redhat.com/mingo/cfs-scheduler/sched-cfs-v2.6.20.20-v22.patch;p=1;patch=1 \
+ file://weaken-div64_32-symbol.patch;patch=1 \
file://defconfig \
"
-
S = "${WORKDIR}/linux-2.6.20"
inherit kernel
@@ -71,8 +71,6 @@ do_stage_append () {
cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/
}
-
-
do_deploy() {
install -d ${DEPLOY_DIR_IMAGE}
install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
More information about the Openembedded-commits
mailing list