kernel.bbclass: Sync with oe-core
PATCH 1/2 kernel.bbclass: Sync with oe-core
This syncs the class with oe-core after 3.0 changes
--- meta-oe/classes/kernel.bbclass | 22 ++++++---------------- 1 files changed, 6 insertions(+), 16 deletions(-)
meta-oe/classes/kernel.bbclass +6 -16
@@ -1,7 +1,7 @@ inherit linux-kernel-base module_strip PROVIDES += "virtual/kernel" -DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}depmod-${@get_kernelmajorversion('${PV}')} virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules" +DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules" # we include gcc above, we dont need virtual/libc INHIBIT_DEFAULT_DEPS = "1"
@@ -65,7 +65,6 @@ KERNEL_IMAGEDEST = "boot" export CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}" KERNEL_VERSION = "${@get_kernelversion('${B}')}" -KERNEL_MAJOR_VERSION = "${@get_kernelmajorversion('${KERNEL_VERSION}')}" KERNEL_LOCALVERSION ?= ""
@@ -85,9 +84,6 @@ KERNEL_ALT_IMAGETYPE ??= "" kernel_do_compile() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}" - if [ "${KERNEL_MAJOR_VERSION}" != "2.6" ]; then - oe_runmake dep CC="${KERNEL_CC}" LD="${KERNEL_LD}" - fi oe_runmake ${KERNEL_IMAGETYPE} ${KERNEL_ALT_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}" }
@@ -123,9 +119,7 @@ kernel_do_install() { install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION} [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION} install -d ${D}/etc/modutils - if [ "${KERNEL_MAJOR_VERSION}" = "2.6" ]; then - install -d ${D}/etc/modprobe.d - fi + install -d ${D}/etc/modprobe.d # # Support for external module building - create a minimal copy of the
@@ -267,7 +261,7 @@ if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then mkdir -p $D/lib/modules/${KERNEL_VERSION} fi if [ -n "$D" ]; then - ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} + ${HOST_PREFIX}depmod -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} else depmod -a fi
@@ -275,7 +269,7 @@ fi pkg_postinst_modules () { if [ -n "$D" ]; then - ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} + ${HOST_PREFIX}depmod -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} else depmod -a update-modules || true
@@ -348,9 +342,8 @@ python populate_packages_prepend () { kernelver_stripped = m.group(1) path = bb.data.getVar("PATH", d, 1) host_prefix = bb.data.getVar("HOST_PREFIX", d, 1) or "" - major_version = bb.data.getVar('KERNEL_MAJOR_VERSION', d, 1) - cmd = "PATH=\"%s\" %sdepmod-%s -n -a -r -b %s -F %s/boot/System.map-%s %s" % (path, host_prefix, major_version, dvar, dvar, kernelver, kernelver_stripped) + cmd = "PATH=\"%s\" %sdepmod -n -a -r -b %s -F %s/boot/System.map-%s %s" % (path, host_prefix, dvar, dvar, kernelver, kernelver_stripped) f = os.popen(cmd, 'r') deps = {}
@@ -427,10 +420,7 @@ python populate_packages_prepend () { # Write out any modconf fragment modconf = bb.data.getVar('module_conf_%s' % basename, d, 1) if modconf: - if bb.data.getVar("KERNEL_MAJOR_VERSION", d, 1) == "2.6": - name = '%s/etc/modprobe.d/%s.conf' % (dvar, basename) - else: - name = '%s/etc/modutils/%s.conf' % (dvar, basename) + name = '%s/etc/modprobe.d/%s.conf' % (dvar, basename) f = open(name, 'w') f.write("%s\n" % modconf) f.close()
Signature · 1 line
1.7.4.1
PATCH 2/2 gcc-4.5: Edit defaults.h in ${B} instead of ${S}, and t-oe in ${B}
This patches are from oe-core needed after shared sourcedir changes to oe-core
--- meta-oe/recipes-devtools/gcc/gcc-4.5.inc | 3 +- .../gcc/gcc-4.5/use-defaults.h-and-t-oe-in-B.patch | 57 ++++++++++++++++++++ 2 files changed, 59 insertions(+), 1 deletions(-) create mode 100644 meta-oe/recipes-devtools/gcc/gcc-4.5/use-defaults.h-and-t-oe-in-B.patch
meta-oe/recipes-devtools/gcc/gcc-4.5.inc +2 -1
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ PV = "4.5" -INC_PR = "r38" +INC_PR = "r39" # BINV should be incremented after updating to a revision # after a minor gcc release (e.g. 4.5.1 or 4.5.2) has been made
@@ -216,6 +216,7 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \ file://gcc-poison-parameters.patch \ file://gcc-ppc-config-fix.patch \ file://gcc-ppc-include-config-linux.h.patch \ + file://use-defaults.h-and-t-oe-in-B.patch \ " # Language Overrides
meta-oe/recipes-devtools/gcc/gcc-4.5/use-defaults.h-and-t-oe-in-B.patch new file +57 -0
57 lines not on this page · raw message
Signature · 1 line
1.7.4.1
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
This one is already in in a different form :)
Op 02-07-11 01:56, Khem Raj schreef:
Quoted 71 lines
This syncs the class with oe-core after 3.0 changes
Signed-off-by Khem Raj <[email protected]> ---meta-oe/classes/kernel.bbclass | 22 ++++++---------------- 1 files
changed, 6 insertions(+), 16 deletions(-)(quoted diff) +0
-0b/meta-oe/classes/kernel.bbclass index 2d051f4..9043b4e 100644 --- a/meta-oe/classes/kernel.bbclass +++ b/meta-oe/classes/kernel.bbclass @@ -1,7 +1,7 @@ inherit linux-kernel-base
module_stripPROVIDES += "virtual/kernel" -DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}depmod-${@get_kernelmajorversion('${PV}')} virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules" +DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules"
# we include gcc above, we dont need virtual/libc INHIBIT_DEFAULT_DEPS = "1" @@ -65,7 +65,6 @@ KERNEL_IMAGEDEST = "boot" export CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}"
KERNEL_VERSION= "${@get_kernelversion('${B}')}"
-KERNEL_MAJOR_VERSION =
"${@get_kernelmajorversion('${KERNEL_VERSION}')}"
KERNEL_LOCALVERSION?= ""(quoted diff) +0
-0@@ -85,9 +84,6 @@ KERNEL_ALT_IMAGETYPE ??= "" kernel_do_compile() {unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
oe_runmakeinclude/linux/version.hCC="${KERNEL_CC}" LD="${KERNEL_LD}" - if [
"${KERNEL_MAJOR_VERSION}" != "2.6" ]; then -oe_runmakedep
CC="${KERNEL_CC}" LD="${KERNEL_LD}" - fioe_runmake
${KERNEL_IMAGETYPE} ${KERNEL_ALT_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}" }(quoted diff) +0
-0@@ -123,9 +119,7 @@ kernel_do_install() { install -m 0644 vmlinux${D}/boot/vmlinux-${KERNEL_VERSION} [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION}
install -d ${D}/etc/modutils - if [ "${KERNEL_MAJOR_VERSION}" = "2.6"
]; then - install -d ${D}/etc/modprobe.d - fi + install -d
${D}/etc/modprobe.d# # Support for external module building - create a minimal copy of the @@ -267,7 +261,7 @@ if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then mkdir -p $D/lib/modules/${KERNEL_VERSION} fi if [ -n "$D" ];
then - ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F
${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}(quoted diff) +1
-0+ ${HOST_PREFIX}depmod -A -b $D -F${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} else depmod -a fi @@ -275,7 +269,7 @@ fi
pkg_postinst_modules() { if [ -n "$D" ]; then - ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}(quoted diff) +1
-0+ ${HOST_PREFIX}depmod -A -b $D -F${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} else depmod -a update-modules || true @@ -348,9 +342,8 @@ python
populate_packages_prepend() {kernelver_stripped=m.group(1)path =bb.data.getVar("PATH", d, 1)host_prefix=bb.data.getVar("HOST_PREFIX", d, 1)or "" -major_version=bb.data.getVar('KERNEL_MAJOR_VERSION', d, 1)(quoted diff) +0
-1- cmd = "PATH=\"%s\" %sdepmod-%s -n -a -r -b %s -F%s/boot/System.map-%s %s" % (path,
host_prefix,major_version, dvar,
dvar, kernelver,kernelver_stripped) + cmd = "PATH=\"%s\" %sdepmod
-n -a -r -b %s -F %s/boot/System.map-%s %s" % (path,host_prefix, dvar, dvar, kernelver,kernelver_stripped) f =os.popen(cmd, 'r')
Quoted 8 lines
deps = {} @@ -427,10 +420,7 @@ python
populate_packages_prepend() { # Write out any modconf fragment modconf =bb.data.getVar('module_conf_%s' % basename, d, 1)if modconf: - ifbb.data.getVar("KERNEL_MAJOR_VERSION", d, 1)== "2.6": - name =
'%s/etc/modprobe.d/%s.conf' % (dvar, basename) - else: - name =
'%s/etc/modutils/%s.conf' % (dvar, basename) + name =
'%s/etc/modprobe.d/%s.conf' % (dvar, basename) f =open(name, 'w')f.write("%s\n" % modconf)f.close()
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFOD4EcMkyGM64RGpERAuv3AKCfkCXcHOT/ywgr88l5A9liAqsUowCfUEpA Vfo6alYXSY6njroProtZHnc=
=0RMq
-----END PGP SIGNATURE-----