summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid-John Willis <John.Willis@Distant-earth.com>2012-04-11 16:13:25 +0100
committerDavid-John Willis <John.Willis@Distant-earth.com>2012-04-11 16:13:25 +0100
commitd7e4e50de1b51f9f13276769ffa04a1b924c9270 (patch)
treebe04bbed38cb6879db140d2bfcda069829faaf0e
parent948b50c0e85fa7dc8b68ec223d6da29c24f635de (diff)
downloadmeta-raspberrypi-d7e4e50de1b51f9f13276769ffa04a1b924c9270.tar.gz
linux-raspberrypi: Recipe Cleanup.
* No functional changes. * Moved to my fork of the kernel tree as I have a few patches to push up. * Also sync over newer linux.inc.
-rwxr-xr-x[-rw-r--r--]recipes-kernel/linux/linux-raspberrypi_3.1.9.bb11
-rwxr-xr-x[-rw-r--r--]recipes-kernel/linux/linux.inc22
2 files changed, 26 insertions, 7 deletions
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.1.9.bb b/recipes-kernel/linux/linux-raspberrypi_3.1.9.bb
index 83f1dcc..8a61f89 100644..100755
--- a/recipes-kernel/linux/linux-raspberrypi_3.1.9.bb
+++ b/recipes-kernel/linux/linux-raspberrypi_3.1.9.bb
@@ -1,18 +1,17 @@
1COMPATIBLE_MACHINE = "raspberrypi"
2
1require linux.inc 3require linux.inc
2 4
3DESCRIPTION = "Linux kernel for the RaspberryPi board" 5DESCRIPTION = "Linux kernel for the RaspberryPi board"
4KERNEL_IMAGETYPE = "zImage"
5
6COMPATIBLE_MACHINE = "raspberrypi"
7 6
8# This is on the rpi-patches branch 7# This is on the rpi-patches branch
9SRCREV = "2fb814968753d0d4a5fdf056a3a8c9eee3c41aa6" 8SRCREV = "2fb814968753d0d4a5fdf056a3a8c9eee3c41aa6"
10 9
11SRC_URI = " \ 10SRC_URI = "git://github.com/djwillis/rpi-linux.git;protocol=git;branch=rpi-patches \
12 git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-patches \
13" 11"
14 12
15PV = "3.1.9-rpi+${PR}+git${SRCREV}" 13LINUX_VERSION ?= "3.1.9-rpi"
14PV = "${LINUX_VERSION}+${PR}+git${SRCREV}"
16 15
17S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
18 17
diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
index a8ddf7f..6996283 100644..100755
--- a/recipes-kernel/linux/linux.inc
+++ b/recipes-kernel/linux/linux.inc
@@ -115,7 +115,7 @@ do_configure_prepend() {
115 fi 115 fi
116 116
117 # Enable thumb2 fixup for specific issue in angstrom toolchains when used on A8 r1p[012] silicon 117 # Enable thumb2 fixup for specific issue in angstrom toolchains when used on A8 r1p[012] silicon
118 if [ "${DISTRO_NAME}" = "Angstrom" -o "${CORTEXA8FIXUP}" = "yes" ] ; then 118 if [ "${CORTEXA8FIXUP}" = "yes" ] ; then
119 sed -i -e /CONFIG_ARM_ERRATA_430973/d ${WORKDIR}/defconfig 119 sed -i -e /CONFIG_ARM_ERRATA_430973/d ${WORKDIR}/defconfig
120 echo "CONFIG_ARM_ERRATA_430973=y" >> ${S}/.config 120 echo "CONFIG_ARM_ERRATA_430973=y" >> ${S}/.config
121 fi 121 fi
@@ -228,6 +228,10 @@ do_configure_append() {
228 fi 228 fi
229} 229}
230 230
231# bitbake.conf only prepends PARALLEL make in tasks called do_compile, which isn't the case for compile_modules
232# So explicitly enable it for that in here
233EXTRA_OEMAKE = "${PARALLEL_MAKE} "
234
231do_install_append() { 235do_install_append() {
232 oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}/src/linux-${KERNEL_VERSION} ARCH=$ARCH 236 oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}/src/linux-${KERNEL_VERSION} ARCH=$ARCH
233} 237}
@@ -260,3 +264,19 @@ pkg_postrm_kernel-devicetree () {
260 cd /${KERNEL_IMAGEDEST}; update-alternatives --remove devicetree devicetree-${KERNEL_VERSION} || true 264 cd /${KERNEL_IMAGEDEST}; update-alternatives --remove devicetree devicetree-${KERNEL_VERSION} || true
261} 265}
262 266
267# Automatically depend on lzop-native if CONFIG_KERNEL_LZO is enabled
268python () {
269 try:
270 defconfig = bb.fetch2.localpath('file://defconfig', d)
271 except bb.fetch2.FetchError:
272 return
273
274 try:
275 configfile = open(defconfig)
276 except IOError:
277 return
278
279 if 'CONFIG_KERNEL_LZO=y\n' in configfile.readlines():
280 depends = d.getVar('DEPENDS', False)
281 d.setVar('DEPENDS', depends + ' lzop-native')
282}