From 1e66320f90413ba2ab5c611da084076c2cde2926 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Fri, 7 Dec 2012 14:08:46 +0100 Subject: kernel: remove all fiddeling with the defconfig, compile the kernel as it is in git --- recipes-kernel/linux/linux.inc | 171 +---------------------------------------- 1 file changed, 4 insertions(+), 167 deletions(-) diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc index 783fd0d..f62b3ca 100644 --- a/recipes-kernel/linux/linux.inc +++ b/recipes-kernel/linux/linux.inc @@ -12,23 +12,11 @@ inherit kernel siteinfo RPSRC = "http://www.rpsys.net/openzaurus/patches/archive" # Enable OABI compat for people stuck with obsolete userspace -ARM_KEEP_OABI ?= "1" +# ARM_KEEP_OABI ?= "1" # Quirk for udev greater or equal 141 UDEV_GE_141 ?= "0" -# Specify the commandline for your device - -# Boot from mmc -CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=/dev/mmcblk0p1 rootfstype=ext2 rootdelay=5" -# Boot from nfs -#CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=301 root=/dev/nfs nfsroot=172.20.3.1:/data/at91 ip=172.20.0.5:::255.255.0.0" - -# Set the verbosity of kernel messages during runtime -# You can define CMDLINE_DEBUG in your local.conf or distro.conf to override this behaviour -CMDLINE_DEBUG ?= '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug", d)}' -CMDLINE_append = " ${CMDLINE_DEBUG} " - # Kernel bootlogo is distro-specific (default is OE logo). # Logo resolution (qvga, vga, ...) is machine-specific. LOGO_SIZE ?= "." @@ -71,161 +59,10 @@ python __anonymous () { bb.data.setVar("PACKAGES", "%s kernel-devicetree" % packages, d) } -do_configure_prepend() { - - # Rename getline in ./scripts/unifdef.c - # Kernels up to 2.6.29 are currently failing to build unifdef.c, - # clashing with exposed getline() from - # see https://patchwork.kernel.org/patch/11166/ - # committed in 2.6.29 (commit d15bd1067b1fcb2b7250d22bc0c7c7fea0b759f7) - - sed -i -e 's/getline/parseline/g' ${S}/scripts/unifdef.c - - - echo "" > ${S}/.config - - # - # logo support, if you supply logo_linux_clut224.ppm in SRC_URI, then it's going to be used - # - if [ -e ${WORKDIR}/${LOGO_SIZE}/logo_linux_clut224.ppm ]; then - install -m 0644 ${WORKDIR}/${LOGO_SIZE}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm - echo "CONFIG_LOGO=y" >> ${S}/.config - echo "CONFIG_LOGO_LINUX_CLUT224=y" >> ${S}/.config - fi - - # - # oabi / eabi support - # - if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibceabi" ]; then - echo "CONFIG_AEABI=y" >> ${S}/.config - if [ "${ARM_KEEP_OABI}" = "1" ] ; then - echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config - else - echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config - fi - else - echo "# CONFIG_AEABI is not set" >> ${S}/.config - echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config - fi - - # When enabling thumb for userspace we also need thumb support in the kernel - if [ "${ARM_INSTRUCTION_SET}" = "thumb" ] ; then - sed -i -e /CONFIG_ARM_THUMB/d ${WORKDIR}/defconfig - echo "CONFIG_ARM_THUMB=y" >> ${S}/.config - fi - - # Enable thumb2 fixup for specific issue in angstrom toolchains when used on A8 r1p[012] silicon - if [ "${CORTEXA8FIXUP}" = "yes" ] ; then - sed -i -e /CONFIG_ARM_ERRATA_430973/d ${WORKDIR}/defconfig - echo "CONFIG_ARM_ERRATA_430973=y" >> ${S}/.config - fi - - # - # endian support - # - if [ "${SITEINFO_ENDIANNESS}" = "be" ]; then - echo "CONFIG_CPU_BIG_ENDIAN=y" >> ${S}/.config - fi - - echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config - - sed -e '/CONFIG_AEABI/d' \ - -e '/CONFIG_OABI_COMPAT=/d' \ - -e '/CONFIG_CMDLINE=/d' \ - -e '/CONFIG_CPU_BIG_ENDIAN/d' \ - -e '/CONFIG_LOGO=/d' \ - -e '/CONFIG_LOGO_LINUX_CLUT224=/d' \ - -e '/CONFIG_LOCALVERSION/d' \ - -e '/CONFIG_LOCALVERSION_AUTO/d' \ - < '${WORKDIR}/defconfig' >>'${S}/.config' - - echo 'CONFIG_LOCALVERSION=""' >>${S}/.config - echo '# CONFIG_LOCALVERSION_AUTO is not set' >>${S}/.config - - # - # Udev quirks - # - - # Newer versions of udev mandate that sysfs doesn't have deprecated entries - if [ "${UDEV_GE_141}" = "1" ] ; then - sed -e /CONFIG_SYSFS_DEPRECATED/d \ - -e /CONFIG_SYSFS_DEPRECATED_V2/d \ - -e /CONFIG_HOTPLUG/d \ - -e /CONFIG_UEVENT_HELPER_PATH/d \ - -e /CONFIG_UNIX/d \ - -e /CONFIG_SYSFS/d \ - -e /CONFIG_PROC_FS/d \ - -e /CONFIG_TMPFS/d \ - -e /CONFIG_INOTIFY_USER/d \ - -e /CONFIG_SIGNALFD/d \ - -e /CONFIG_TMPFS_POSIX_ACL/d \ - -e /CONFIG_BLK_DEV_BSG/d \ - -i '${S}/.config' - - echo '# CONFIG_SYSFS_DEPRECATED is not set' >> ${S}/.config - echo '# CONFIG_SYSFS_DEPRECATED_V2 is not set' >> ${S}/.config - echo 'CONFIG_HOTPLUG=y' >> ${S}/.config - echo 'CONFIG_UEVENT_HELPER_PATH=""' >> ${S}/.config - echo 'CONFIG_UNIX=y' >> ${S}/.config - echo 'CONFIG_SYSFS=y' >> ${S}/.config - echo 'CONFIG_PROC_FS=y' >> ${S}/.config - echo 'CONFIG_TMPFS=y' >> ${S}/.config - echo 'CONFIG_INOTIFY_USER=y' >> ${S}/.config - echo 'CONFIG_SIGNALFD=y' >> ${S}/.config - echo 'CONFIG_TMPFS_POSIX_ACL=y' >> ${S}/.config - echo 'CONFIG_BLK_DEV_BSG=y' >> ${S}/.config - echo 'CONFIG_DEVTMPFS=y' >> ${S}/.config - echo 'CONFIG_DEVTMPFS_MOUNT=y' >> ${S}/.config - fi - - # Newer inits like systemd need cgroup support - if [ "${KERNEL_ENABLE_CGROUPS}" = "1" ] ; then - sed -e /CONFIG_CGROUP_SCHED/d \ - -e /CONFIG_CGROUPS/d \ - -i '${S}/.config' - - echo 'CONFIG_CGROUP_SCHED=y' >> ${S}/.config - echo 'CONFIG_CGROUPS=y' >> ${S}/.config - echo 'CONFIG_CGROUP_NS=y' >> ${S}/.config - echo 'CONFIG_CGROUP_FREEZER=y' >> ${S}/.config - echo 'CONFIG_CGROUP_DEVICE=y' >> ${S}/.config - echo 'CONFIG_CPUSETS=y' >> ${S}/.config - echo 'CONFIG_PROC_PID_CPUSET=y' >> ${S}/.config - echo 'CONFIG_CGROUP_CPUACCT=y' >> ${S}/.config - echo 'CONFIG_RESOURCE_COUNTERS=y' >> ${S}/.config - fi - - # - # root-over-nfs-over-usb-eth support. Limited, but should cover some cases. - # Enable this by setting a proper CMDLINE_NFSROOT_USB. - # - if [ ! -z "${CMDLINE_NFSROOT_USB}" ]; then - oenote "Configuring the kernel for root-over-nfs-over-usb-eth with CMDLINE ${CMDLINE_NFSROOT_USB}" - sed -e '/CONFIG_INET/d' \ - -e '/CONFIG_IP_PNP=/d' \ - -e '/CONFIG_USB_GADGET=/d' \ - -e '/CONFIG_USB_GADGET_SELECTED=/d' \ - -e '/CONFIG_USB_ETH=/d' \ - -e '/CONFIG_NFS_FS=/d' \ - -e '/CONFIG_ROOT_NFS=/d' \ - -e '/CONFIG_CMDLINE=/d' \ - -i ${S}/.config - echo "CONFIG_INET=y" >> ${S}/.config - echo "CONFIG_IP_PNP=y" >> ${S}/.config - echo "CONFIG_USB_GADGET=y" >> ${S}/.config - echo "CONFIG_USB_GADGET_SELECTED=y" >> ${S}/.config - echo "CONFIG_USB_ETH=y" >> ${S}/.config - echo "CONFIG_NFS_FS=y" >> ${S}/.config - echo "CONFIG_ROOT_NFS=y" >> ${S}/.config - echo "CONFIG_CMDLINE=\"${CMDLINE_NFSROOT_USB}\"" >> ${S}/.config - fi - yes '' | oe_runmake oldconfig -} - do_configure_append() { - if test -e scripts/Makefile.fwinst ; then - sed -i -e "s:-m0644:-m 0644:g" scripts/Makefile.fwinst - fi + if test -e scripts/Makefile.fwinst ; then + sed -i -e "s:-m0644:-m 0644:g" scripts/Makefile.fwinst + fi } # bitbake.conf only prepends PARALLEL make in tasks called do_compile, which isn't the case for compile_modules -- cgit v1.2.3