diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc index 783fd0d..493616c 100644 --- a/recipes-kernel/linux/linux.inc +++ b/recipes-kernel/linux/linux.inc @@ -6,262 +6,111 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" inherit kernel siteinfo -# Try to build & install perf -#require recipes-kernel/linux/linux-tools.inc - -RPSRC = "http://www.rpsys.net/openzaurus/patches/archive" - # Enable OABI compat for people stuck with obsolete userspace 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" +UDEV_GE_141 ?= "1" # Set the verbosity of kernel messages during runtime -# You can define CMDLINE_DEBUG in your local.conf or distro.conf to override this behaviour +# 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} " +CMDLINE_append = " ${CMDLINE_DEBUG}" -# Kernel bootlogo is distro-specific (default is OE logo). -# Logo resolution (qvga, vga, ...) is machine-specific. -LOGO_SIZE ?= "." - -# Support for binary device tree generation - -FILES_kernel-devicetree = "/boot/devicetree*" - -KERNEL_DEVICETREE_boc01 = "${WORKDIR}/boc01.dts" -KERNEL_DEVICETREE_calamari = "arch/${ARCH}/boot/dts/mpc8536ds.dts" -KERNEL_DEVICETREE_canyonlands = "arch/${ARCH}/boot/dts/canyonlands.dts" -KERNEL_DEVICETREE_kilauea = "arch/${ARCH}/boot/dts/kilauea.dts" -KERNEL_DEVICETREE_lite5200 = "arch/${ARCH}/boot/dts/lite5200.dts" -KERNEL_DEVICETREE_lsppchd = "arch/${ARCH}/boot/dts/kuroboxHD.dts" -KERNEL_DEVICETREE_lsppchg = "arch/${ARCH}/boot/dts/kuroboxHG.dts" -KERNEL_DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts" -KERNEL_DEVICETREE_mpc8315e-rdb = "arch/${ARCH}/boot/dts/mpc8315erdb.dts" -KERNEL_DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts" -KERNEL_DEVICETREE_mpc8544ds = "arch/${ARCH}/boot/dts/mpc8544ds.dts" -KERNEL_DEVICETREE_mpc8641-hpcn = "arch/${ARCH}/boot/dts/mpc8641_hpcn.dts" -KERNEL_DEVICETREE_p1020rdb = "arch/${ARCH}/boot/dts/p1020rdb.dts" -KERNEL_DEVICETREE_p2020ds = "arch/${ARCH}/boot/dts/p2020ds.dts" -KERNEL_DEVICETREE_sequoia = "arch/${ARCH}/boot/dts/sequoia.dts" -KERNEL_DEVICETREE_tqm8540 = "arch/${ARCH}/boot/dts/tqm8540.dts" -KERNEL_DEVICETREE_xilinx-ml507 = "arch/${ARCH}/boot/dts/virtex440-ml507.dts" - -KERNEL_DEVICETREE_FLAGS = "-R 8 -S 0x3000" - -CORTEXA8FIXUP ?= "yes" - -python __anonymous () { - - import bb - - devicetree = bb.data.getVar('KERNEL_DEVICETREE', d, 1) or '' - if devicetree: - depends = bb.data.getVar("DEPENDS", d, 1) - bb.data.setVar("DEPENDS", "%s dtc-native" % depends, d) - packages = bb.data.getVar("PACKAGES", d, 1) - 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 +# Set a variable in .configure +# $1 - Configure variable to be set +# $2 - value [n/y/value] +kernel_configure_variable() { + # Remove the config + CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;" + if test "$2" = "n" + then + echo "# CONFIG_$1 is not set" >> ${S}/.config + else + echo "CONFIG_$1=$2" >> ${S}/.config fi } -# bitbake.conf only prepends PARALLEL make in tasks called do_compile, which isn't the case for compile_modules -# So explicitly enable it for that in here -EXTRA_OEMAKE = "${PARALLEL_MAKE} " +do_configure_prepend() { + # Clean .config + echo "" > ${S}/.config + CONF_SED_SCRIPT="" -do_install_append() { - oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}/src/linux-${KERNEL_VERSION} ARCH=$ARCH -} + # oabi / eabi support + if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibceabi" ]; then + kernel_configure_variable AEABI y + if [ "${ARM_KEEP_OABI}" = "1" ] ; then + kernel_configure_variable OABI_COMPAT y + else + kernel_configure_variable OABI_COMPAT n + fi + else + kernel_configure_variable AEABI n + kernel_configure_variable OABI_COMPAT n + fi -PACKAGES =+ "kernel-headers" -FILES_kernel-headers = "${exec_prefix}/src/linux*" + # Set cmdline + kernel_configure_variable CMDLINE "\"${CMDLINE}\"" -do_devicetree_image() { - if test -n "${KERNEL_DEVICETREE}" ; then - dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o devicetree ${KERNEL_DEVICETREE} - install -d ${D}/boot - install -m 0644 devicetree ${D}/boot/devicetree-${KERNEL_VERSION} - install -d ${DEPLOY_DIR_IMAGE} - install -m 0644 devicetree ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb - package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb - cd ${DEPLOY_DIR_IMAGE} - rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb - ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb - package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_SYMLINK_NAME}.dtb - fi -} + # Localversion + kernel_configure_variable LOCALVERSION "\"\"" + kernel_configure_variable LOCALVERSION_AUTO n -addtask devicetree_image after do_install before do_package do_deploy + # Udev quirks + # Newer versions of udev mandate that sysfs doesn't have deprecated entries + if [ "${UDEV_GE_141}" = "1" ] ; then + kernel_configure_variable SYSFS_DEPRECATED n + kernel_configure_variable SYSFS_DEPRECATED_V2 n + kernel_configure_variable HOTPLUG y + kernel_configure_variable UEVENT_HELPER_PATH "\"\"" + kernel_configure_variable UNIX y + kernel_configure_variable SYSFS y + kernel_configure_variable PROC_FS y + kernel_configure_variable TMPFS y + kernel_configure_variable INOTIFY_USER y + kernel_configure_variable SIGNALFD y + kernel_configure_variable TMPFS_POSIX_ACL y + kernel_configure_variable BLK_DEV_BSG y + kernel_configure_variable DEVTMPFS y + kernel_configure_variable DEVTMPFS_MOUNT y + fi -pkg_postinst_kernel-devicetree () { - cd /${KERNEL_IMAGEDEST}; update-alternatives --install /${KERNEL_IMAGEDEST}/devicetree devicetree devicetree-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true -} + # Newer inits like systemd need cgroup support + if [ "${KERNEL_ENABLE_CGROUPS}" = "1" ] ; then + kernel_configure_variable CGROUP_SCHED y + kernel_configure_variable CGROUPS y + kernel_configure_variable CGROUP_NS y + kernel_configure_variable CGROUP_FREEZER y + kernel_configure_variable CGROUP_DEVICE y + kernel_configure_variable CPUSETS y + kernel_configure_variable PROC_PID_CPUSET y + kernel_configure_variable CGROUP_CPUACCT y + kernel_configure_variable RESOURCE_COUNTERS y + fi -pkg_postrm_kernel-devicetree () { - cd /${KERNEL_IMAGEDEST}; update-alternatives --remove devicetree devicetree-${KERNEL_VERSION} || true + # 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}" + kernel_configure_variable INET y + kernel_configure_variable IP_PNP y + kernel_configure_variable USB_GADGET y + kernel_configure_variable USB_GADGET_SELECTED y + kernel_configure_variable USB_ETH y + kernel_configure_variable NFS_FS y + kernel_configure_variable ROOT_NFS y + kernel_configure_variable ROOT_NFS y + kernel_configure_variable CMDLINE "\"${CMDLINE_NFSROOT_USB}\"" + fi + + # Activate CONFIG_LEGACY_PTYS + kernel_configure_variable LEGACY_PTYS y + + # Keep this the last line + # Remove all modified configs and add the rest to .config + sed -e "${CONF_SED_SCRIPT}" < '${WORKDIR}/defconfig' >> '${S}/.config' + + yes '' | oe_runmake oldconfig } # Automatically depend on lzop-native if CONFIG_KERNEL_LZO is enabled