* [meta-raspberrypi] [patch] linux-raspberrypi_Rename_linux.inc_to_linux-rpi.inc
@ 2016-04-04 18:40 Herrie
2016-04-04 19:28 ` Andrei Gherzan
0 siblings, 1 reply; 4+ messages in thread
From: Herrie @ 2016-04-04 18:40 UTC (permalink / raw)
To: yocto
[-- Attachment #1: Type: text/plain, Size: 11293 bytes --]
From 164d6ec1b054fa241e65ac4961d204edd9965061 Mon Sep 17 00:00:00 2001
From: Alan Stice <alan@alanstice.com>
Date: Thu, 10 Mar 2016 08:52:07 -0800
Subject: [PATCH] linux-raspberrypi: Rename linux.inc to linux-rpi.inc Rename
linux.inc to prevent it from impacting other machines while building
multiple targets with same architecture sharing sstate.
Signed-off-by: Alan Stice <alan@alanstice.com>
Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
---
recipes-kernel/linux/linux-raspberrypi.inc | 2 +-
recipes-kernel/linux/linux-rpi.inc | 132
+++++++++++++++++++++++++++++
recipes-kernel/linux/linux.inc | 132
-----------------------------
3 files changed, 133 insertions(+), 133 deletions(-)
create mode 100644 recipes-kernel/linux/linux-rpi.inc
delete mode 100644 recipes-kernel/linux/linux.inc
diff --git a/recipes-kernel/linux/linux-raspberrypi.inc
b/recipes-kernel/linux/linux-raspberrypi.inc
index 24e7fe2..7ab1de2 100644
--- a/recipes-kernel/linux/linux-raspberrypi.inc
+++ b/recipes-kernel/linux/linux-raspberrypi.inc
@@ -1,4 +1,4 @@
-require linux.inc
+require linux-rpi.inc
inherit linux-raspberrypi-base
DESCRIPTION = "Linux Kernel for Raspberry Pi"
diff --git a/recipes-kernel/linux/linux-rpi.inc
b/recipes-kernel/linux/linux-rpi.inc
new file mode 100644
index 0000000..fae78b7
--- /dev/null
+++ b/recipes-kernel/linux/linux-rpi.inc
@@ -0,0 +1,132 @@
+DESCRIPTION = "Linux Kernel"
+SECTION = "kernel"
+LICENSE = "GPLv2"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+
+inherit kernel siteinfo
+require recipes-kernel/linux/linux-yocto.inc
+
+# Enable OABI compat for people stuck with obsolete userspace
+ARM_KEEP_OABI ?= "1"
+
+# Quirk for udev greater or equal 141
+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
+CMDLINE_DEBUG ?= '${@base_conditional("DISTRO_TYPE", "release",
"quiet", "debug", d)}'
+CMDLINE_append = " ${CMDLINE_DEBUG}"
+
+# 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" >> ${B}/.config
+ else
+ echo "CONFIG_$1=$2" >> ${B}/.config
+ fi
+}
+
+do_configure_prepend() {
+ # Clean .config
+ echo "" > ${B}/.config
+ CONF_SED_SCRIPT=""
+
+ # 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
+
+ # Set cmdline
+ kernel_configure_variable CMDLINE "\"${CMDLINE}\""
+
+ # Localversion
+ kernel_configure_variable LOCALVERSION "\"\""
+ kernel_configure_variable LOCALVERSION_AUTO n
+
+ # 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
+
+ # 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
+
+ # 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' >> '${B}/.config'
+
+ yes '' | oe_runmake oldconfig
+}
+
+# Automatically depend on lzop-native if CONFIG_KERNEL_LZO is enabled
+python () {
+ try:
+ defconfig = bb.fetch2.localpath('file://defconfig', d)
+ except bb.fetch2.FetchError:
+ return
+
+ try:
+ configfile = open(defconfig)
+ except IOError:
+ return
+
+ if 'CONFIG_KERNEL_LZO=y\n' in configfile.readlines():
+ depends = d.getVar('DEPENDS', False)
+ d.setVar('DEPENDS', depends + ' lzop-native')
+}
diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
deleted file mode 100644
index fae78b7..0000000
--- a/recipes-kernel/linux/linux.inc
+++ /dev/null
@@ -1,132 +0,0 @@
-DESCRIPTION = "Linux Kernel"
-SECTION = "kernel"
-LICENSE = "GPLv2"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-
-inherit kernel siteinfo
-require recipes-kernel/linux/linux-yocto.inc
-
-# Enable OABI compat for people stuck with obsolete userspace
-ARM_KEEP_OABI ?= "1"
-
-# Quirk for udev greater or equal 141
-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
-CMDLINE_DEBUG ?= '${@base_conditional("DISTRO_TYPE", "release",
"quiet", "debug", d)}'
-CMDLINE_append = " ${CMDLINE_DEBUG}"
-
-# 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" >> ${B}/.config
- else
- echo "CONFIG_$1=$2" >> ${B}/.config
- fi
-}
-
-do_configure_prepend() {
- # Clean .config
- echo "" > ${B}/.config
- CONF_SED_SCRIPT=""
-
- # 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
-
- # Set cmdline
- kernel_configure_variable CMDLINE "\"${CMDLINE}\""
-
- # Localversion
- kernel_configure_variable LOCALVERSION "\"\""
- kernel_configure_variable LOCALVERSION_AUTO n
-
- # 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
-
- # 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
-
- # 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' >> '${B}/.config'
-
- yes '' | oe_runmake oldconfig
-}
-
-# Automatically depend on lzop-native if CONFIG_KERNEL_LZO is enabled
-python () {
- try:
- defconfig = bb.fetch2.localpath('file://defconfig', d)
- except bb.fetch2.FetchError:
- return
-
- try:
- configfile = open(defconfig)
- except IOError:
- return
-
- if 'CONFIG_KERNEL_LZO=y\n' in configfile.readlines():
- depends = d.getVar('DEPENDS', False)
- d.setVar('DEPENDS', depends + ' lzop-native')
-}
[-- Attachment #2: linux-raspberrypi_Rename_linux.inc_to_linux-rpi.inc.patch --]
[-- Type: text/plain, Size: 10811 bytes --]
From 164d6ec1b054fa241e65ac4961d204edd9965061 Mon Sep 17 00:00:00 2001
From: Alan Stice <alan@alanstice.com>
Date: Thu, 10 Mar 2016 08:52:07 -0800
Subject: [PATCH] linux-raspberrypi: Rename linux.inc to linux-rpi.inc Rename
linux.inc to prevent it from impacting other machines
Signed-off-by: Alan Stice <alan@alanstice.com>
---
recipes-kernel/linux/linux-raspberrypi.inc | 2 +-
recipes-kernel/linux/linux-rpi.inc | 132 +++++++++++++++++++++++++++++
recipes-kernel/linux/linux.inc | 132 -----------------------------
3 files changed, 133 insertions(+), 133 deletions(-)
create mode 100644 recipes-kernel/linux/linux-rpi.inc
delete mode 100644 recipes-kernel/linux/linux.inc
diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc
index 24e7fe2..7ab1de2 100644
--- a/recipes-kernel/linux/linux-raspberrypi.inc
+++ b/recipes-kernel/linux/linux-raspberrypi.inc
@@ -1,4 +1,4 @@
-require linux.inc
+require linux-rpi.inc
inherit linux-raspberrypi-base
DESCRIPTION = "Linux Kernel for Raspberry Pi"
diff --git a/recipes-kernel/linux/linux-rpi.inc b/recipes-kernel/linux/linux-rpi.inc
new file mode 100644
index 0000000..fae78b7
--- /dev/null
+++ b/recipes-kernel/linux/linux-rpi.inc
@@ -0,0 +1,132 @@
+DESCRIPTION = "Linux Kernel"
+SECTION = "kernel"
+LICENSE = "GPLv2"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+
+inherit kernel siteinfo
+require recipes-kernel/linux/linux-yocto.inc
+
+# Enable OABI compat for people stuck with obsolete userspace
+ARM_KEEP_OABI ?= "1"
+
+# Quirk for udev greater or equal 141
+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
+CMDLINE_DEBUG ?= '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug", d)}'
+CMDLINE_append = " ${CMDLINE_DEBUG}"
+
+# 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" >> ${B}/.config
+ else
+ echo "CONFIG_$1=$2" >> ${B}/.config
+ fi
+}
+
+do_configure_prepend() {
+ # Clean .config
+ echo "" > ${B}/.config
+ CONF_SED_SCRIPT=""
+
+ # 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
+
+ # Set cmdline
+ kernel_configure_variable CMDLINE "\"${CMDLINE}\""
+
+ # Localversion
+ kernel_configure_variable LOCALVERSION "\"\""
+ kernel_configure_variable LOCALVERSION_AUTO n
+
+ # 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
+
+ # 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
+
+ # 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' >> '${B}/.config'
+
+ yes '' | oe_runmake oldconfig
+}
+
+# Automatically depend on lzop-native if CONFIG_KERNEL_LZO is enabled
+python () {
+ try:
+ defconfig = bb.fetch2.localpath('file://defconfig', d)
+ except bb.fetch2.FetchError:
+ return
+
+ try:
+ configfile = open(defconfig)
+ except IOError:
+ return
+
+ if 'CONFIG_KERNEL_LZO=y\n' in configfile.readlines():
+ depends = d.getVar('DEPENDS', False)
+ d.setVar('DEPENDS', depends + ' lzop-native')
+}
diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
deleted file mode 100644
index fae78b7..0000000
--- a/recipes-kernel/linux/linux.inc
+++ /dev/null
@@ -1,132 +0,0 @@
-DESCRIPTION = "Linux Kernel"
-SECTION = "kernel"
-LICENSE = "GPLv2"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-
-inherit kernel siteinfo
-require recipes-kernel/linux/linux-yocto.inc
-
-# Enable OABI compat for people stuck with obsolete userspace
-ARM_KEEP_OABI ?= "1"
-
-# Quirk for udev greater or equal 141
-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
-CMDLINE_DEBUG ?= '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug", d)}'
-CMDLINE_append = " ${CMDLINE_DEBUG}"
-
-# 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" >> ${B}/.config
- else
- echo "CONFIG_$1=$2" >> ${B}/.config
- fi
-}
-
-do_configure_prepend() {
- # Clean .config
- echo "" > ${B}/.config
- CONF_SED_SCRIPT=""
-
- # 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
-
- # Set cmdline
- kernel_configure_variable CMDLINE "\"${CMDLINE}\""
-
- # Localversion
- kernel_configure_variable LOCALVERSION "\"\""
- kernel_configure_variable LOCALVERSION_AUTO n
-
- # 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
-
- # 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
-
- # 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' >> '${B}/.config'
-
- yes '' | oe_runmake oldconfig
-}
-
-# Automatically depend on lzop-native if CONFIG_KERNEL_LZO is enabled
-python () {
- try:
- defconfig = bb.fetch2.localpath('file://defconfig', d)
- except bb.fetch2.FetchError:
- return
-
- try:
- configfile = open(defconfig)
- except IOError:
- return
-
- if 'CONFIG_KERNEL_LZO=y\n' in configfile.readlines():
- depends = d.getVar('DEPENDS', False)
- d.setVar('DEPENDS', depends + ' lzop-native')
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [meta-raspberrypi] [patch] linux-raspberrypi_Rename_linux.inc_to_linux-rpi.inc
2016-04-04 18:40 [meta-raspberrypi] [patch] linux-raspberrypi_Rename_linux.inc_to_linux-rpi.inc Herrie
@ 2016-04-04 19:28 ` Andrei Gherzan
2016-04-04 19:45 ` Herrie
0 siblings, 1 reply; 4+ messages in thread
From: Andrei Gherzan @ 2016-04-04 19:28 UTC (permalink / raw)
To: yoctoproject.org; +Cc: yocto
[-- Attachment #1: Type: text/plain, Size: 2482 bytes --]
Hello,
On Mon, Apr 04, 2016 at 08:40:32PM +0200, Herrie wrote:
> From 164d6ec1b054fa241e65ac4961d204edd9965061 Mon Sep 17 00:00:00 2001
> From: Alan Stice <alan@alanstice.com>
> Date: Thu, 10 Mar 2016 08:52:07 -0800
> Subject: [PATCH] linux-raspberrypi: Rename linux.inc to linux-rpi.inc Rename
> linux.inc to prevent it from impacting other machines while building
> multiple targets with same architecture sharing sstate.
>
> Signed-off-by: Alan Stice <alan@alanstice.com>
> Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
> ---
> recipes-kernel/linux/linux-raspberrypi.inc | 2 +-
> recipes-kernel/linux/linux-rpi.inc | 132
> +++++++++++++++++++++++++++++
> recipes-kernel/linux/linux.inc | 132
> -----------------------------
> 3 files changed, 133 insertions(+), 133 deletions(-)
> create mode 100644 recipes-kernel/linux/linux-rpi.inc
> delete mode 100644 recipes-kernel/linux/linux.inc
>
> diff --git a/recipes-kernel/linux/linux-raspberrypi.inc
> b/recipes-kernel/linux/linux-raspberrypi.inc
> index 24e7fe2..7ab1de2 100644
> --- a/recipes-kernel/linux/linux-raspberrypi.inc
> +++ b/recipes-kernel/linux/linux-raspberrypi.inc
> @@ -1,4 +1,4 @@
> -require linux.inc
> +require linux-rpi.inc
> inherit linux-raspberrypi-base
>
> DESCRIPTION = "Linux Kernel for Raspberry Pi"
> diff --git a/recipes-kernel/linux/linux-rpi.inc
> b/recipes-kernel/linux/linux-rpi.inc
> new file mode 100644
> index 0000000..fae78b7
> --- /dev/null
> +++ b/recipes-kernel/linux/linux-rpi.inc
> @@ -0,0 +1,132 @@
> +DESCRIPTION = "Linux Kernel"
> +SECTION = "kernel"
> +LICENSE = "GPLv2"
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
> +
> +inherit kernel siteinfo
> +require recipes-kernel/linux/linux-yocto.inc
> +
> +# Enable OABI compat for people stuck with obsolete userspace
> +ARM_KEEP_OABI ?= "1"
> +
> +# Quirk for udev greater or equal 141
> +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
> +CMDLINE_DEBUG ?= '${@base_conditional("DISTRO_TYPE", "release", "quiet",
> "debug", d)}'
There seems to be issues in applying this patch as some of the lines get
wrapped to (probably) 80 chars or so. Could you please make sure you
send this patch in plain text and without this wrapping? Thanks man.
--
Andrei Gherzan
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [meta-raspberrypi] [patch] linux-raspberrypi_Rename_linux.inc_to_linux-rpi.inc
2016-04-04 19:28 ` Andrei Gherzan
@ 2016-04-04 19:45 ` Herrie
2016-04-04 21:58 ` Andrei Gherzan
0 siblings, 1 reply; 4+ messages in thread
From: Herrie @ 2016-04-04 19:45 UTC (permalink / raw)
To: Andrei Gherzan, yocto
Andrei,
Hopefully better like this. Changed it to plain text at my end now for
below patch
Cheers,
Herman
From 164d6ec1b054fa241e65ac4961d204edd9965061 Mon Sep 17 00:00:00 2001
From: Alan Stice <alan@alanstice.com>
Date: Thu, 10 Mar 2016 08:52:07 -0800
Subject: [PATCH] linux-raspberrypi: Rename linux.inc to linux-rpi.inc
Rename linux.inc to prevent it from impacting other machines while
building multiple targets with same architecture sharing sstate.
Signed-off-by: Alan Stice <alan@alanstice.com>
Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
---
recipes-kernel/linux/linux-raspberrypi.inc | 2 +-
recipes-kernel/linux/linux-rpi.inc | 132
+++++++++++++++++++++++++++++
recipes-kernel/linux/linux.inc | 132
-----------------------------
3 files changed, 133 insertions(+), 133 deletions(-)
create mode 100644 recipes-kernel/linux/linux-rpi.inc
delete mode 100644 recipes-kernel/linux/linux.inc
diff --git a/recipes-kernel/linux/linux-raspberrypi.inc
b/recipes-kernel/linux/linux-raspberrypi.inc
index 24e7fe2..7ab1de2 100644
--- a/recipes-kernel/linux/linux-raspberrypi.inc
+++ b/recipes-kernel/linux/linux-raspberrypi.inc
@@ -1,4 +1,4 @@
-require linux.inc
+require linux-rpi.inc
inherit linux-raspberrypi-base
DESCRIPTION = "Linux Kernel for Raspberry Pi"
diff --git a/recipes-kernel/linux/linux-rpi.inc
b/recipes-kernel/linux/linux-rpi.inc
new file mode 100644
index 0000000..fae78b7
--- /dev/null
+++ b/recipes-kernel/linux/linux-rpi.inc
@@ -0,0 +1,132 @@
+DESCRIPTION = "Linux Kernel"
+SECTION = "kernel"
+LICENSE = "GPLv2"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+
+inherit kernel siteinfo
+require recipes-kernel/linux/linux-yocto.inc
+
+# Enable OABI compat for people stuck with obsolete userspace
+ARM_KEEP_OABI ?= "1"
+
+# Quirk for udev greater or equal 141
+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
+CMDLINE_DEBUG ?= '${@base_conditional("DISTRO_TYPE", "release",
"quiet", "debug", d)}'
+CMDLINE_append = " ${CMDLINE_DEBUG}"
+
+# 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" >> ${B}/.config
+ else
+ echo "CONFIG_$1=$2" >> ${B}/.config
+ fi
+}
+
+do_configure_prepend() {
+ # Clean .config
+ echo "" > ${B}/.config
+ CONF_SED_SCRIPT=""
+
+ # 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
+
+ # Set cmdline
+ kernel_configure_variable CMDLINE "\"${CMDLINE}\""
+
+ # Localversion
+ kernel_configure_variable LOCALVERSION "\"\""
+ kernel_configure_variable LOCALVERSION_AUTO n
+
+ # 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
+
+ # 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
+
+ # 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' >> '${B}/.config'
+
+ yes '' | oe_runmake oldconfig
+}
+
+# Automatically depend on lzop-native if CONFIG_KERNEL_LZO is enabled
+python () {
+ try:
+ defconfig = bb.fetch2.localpath('file://defconfig', d)
+ except bb.fetch2.FetchError:
+ return
+
+ try:
+ configfile = open(defconfig)
+ except IOError:
+ return
+
+ if 'CONFIG_KERNEL_LZO=y\n' in configfile.readlines():
+ depends = d.getVar('DEPENDS', False)
+ d.setVar('DEPENDS', depends + ' lzop-native')
+}
diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
deleted file mode 100644
index fae78b7..0000000
--- a/recipes-kernel/linux/linux.inc
+++ /dev/null
@@ -1,132 +0,0 @@
-DESCRIPTION = "Linux Kernel"
-SECTION = "kernel"
-LICENSE = "GPLv2"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-
-inherit kernel siteinfo
-require recipes-kernel/linux/linux-yocto.inc
-
-# Enable OABI compat for people stuck with obsolete userspace
-ARM_KEEP_OABI ?= "1"
-
-# Quirk for udev greater or equal 141
-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
-CMDLINE_DEBUG ?= '${@base_conditional("DISTRO_TYPE", "release",
"quiet", "debug", d)}'
-CMDLINE_append = " ${CMDLINE_DEBUG}"
-
-# 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" >> ${B}/.config
- else
- echo "CONFIG_$1=$2" >> ${B}/.config
- fi
-}
-
-do_configure_prepend() {
- # Clean .config
- echo "" > ${B}/.config
- CONF_SED_SCRIPT=""
-
- # 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
-
- # Set cmdline
- kernel_configure_variable CMDLINE "\"${CMDLINE}\""
-
- # Localversion
- kernel_configure_variable LOCALVERSION "\"\""
- kernel_configure_variable LOCALVERSION_AUTO n
-
- # 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
-
- # 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
-
- # 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' >> '${B}/.config'
-
- yes '' | oe_runmake oldconfig
-}
-
-# Automatically depend on lzop-native if CONFIG_KERNEL_LZO is enabled
-python () {
- try:
- defconfig = bb.fetch2.localpath('file://defconfig', d)
- except bb.fetch2.FetchError:
- return
-
- try:
- configfile = open(defconfig)
- except IOError:
- return
-
- if 'CONFIG_KERNEL_LZO=y\n' in configfile.readlines():
- depends = d.getVar('DEPENDS', False)
- d.setVar('DEPENDS', depends + ' lzop-native')
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [meta-raspberrypi] [patch] linux-raspberrypi_Rename_linux.inc_to_linux-rpi.inc
2016-04-04 19:45 ` Herrie
@ 2016-04-04 21:58 ` Andrei Gherzan
0 siblings, 0 replies; 4+ messages in thread
From: Andrei Gherzan @ 2016-04-04 21:58 UTC (permalink / raw)
To: yoctoproject.org; +Cc: yocto
[-- Attachment #1: Type: text/plain, Size: 268 bytes --]
Hello,
On Mon, Apr 04, 2016 at 09:45:55PM +0200, Herrie wrote:
>
> Andrei,
>
> Hopefully better like this. Changed it to plain text at my end now for below
> patch
>
Sadly nothing changed. Lines are still wrapped breaking the patch.
--
Andrei Gherzan
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-04-04 21:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-04 18:40 [meta-raspberrypi] [patch] linux-raspberrypi_Rename_linux.inc_to_linux-rpi.inc Herrie
2016-04-04 19:28 ` Andrei Gherzan
2016-04-04 19:45 ` Herrie
2016-04-04 21:58 ` Andrei Gherzan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.