Kernel upgrade and small fixes

PATCH Applied Martin Jansa 2 participants 6 messages Jan 13, 2012 – Jan 14, 2012

lore

Share & tools

lore

Martin Jansa

author

2012-01-13 19:22 UTC #0 lore raw

cover Kernel upgrade and small fixes

The following changes since commit d76030c7744dfb480c8d43073762d11dcae4893a:

linux(-kexecboot): upgrade from 3.1.6 to 3.1.7 (2012-01-05 08:49:23 +0000)

are available in the git repository at:
git://gitorious.org/shr/meta-handheld jansa/pull

Martin Jansa (4):
zaurus.inc: weak assignment to IMAGE_FSTYPES linux(-kexecboot)-git: upgrade to 3.2.0-rc7 linux(-kexecboot)-3.2: add 3.2.1 for spitz linux(-kexecboot)-3.1: move common stuff like SRC_URI and checksums
to .inc file

 conf/machine/include/zaurus.inc                    |    2 +-
 recipes-kernel/linux/linux-3.1.inc                 |   19 +
 recipes-kernel/linux/linux-3.2.inc                 |   14 +
 recipes-kernel/linux/linux-3.2/spitz/defconfig     |  384 ++++++++++++++++++++
 recipes-kernel/linux/linux-git.inc                 |    4 +-
 .../linux/linux-kexecboot-3.2/spitz/defconfig      |  128 +++++++
 recipes-kernel/linux/linux-kexecboot_3.1.bb        |   21 +-
 recipes-kernel/linux/linux-kexecboot_3.2.bb        |    5 +
 recipes-kernel/linux/linux-kexecboot_git.bb        |    2 +
 recipes-kernel/linux/linux/spitz/defconfig         |    7 +
 recipes-kernel/linux/linux_3.1.bb                  |   21 +-
 recipes-kernel/linux/linux_3.2.bb                  |    4 +
 recipes-kernel/linux/linux_git.bb                  |    2 +
 13 files changed, 570 insertions(+), 43 deletions(-)
 create mode 100644 recipes-kernel/linux/linux-3.1.inc
 create mode 100644 recipes-kernel/linux/linux-3.2.inc
 create mode 100644 recipes-kernel/linux/linux-3.2/spitz/defconfig
 create mode 100644 recipes-kernel/linux/linux-kexecboot-3.2/spitz/defconfig
 create mode 100644 recipes-kernel/linux/linux-kexecboot_3.2.bb
 create mode 100644 recipes-kernel/linux/linux_3.2.bb

Signature · 1 line

1.7.8.3

Martin Jansa

author

2012-01-13 19:24 UTC #1 lore raw

PATCH 1/4 zaurus.inc: weak assignment to IMAGE_FSTYPES

* easier for builder to limit IMAGE_FSTYPES in local.conf

Signed-off-by Martin Jansa <[email protected]>

---
 conf/machine/include/zaurus.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

conf/machine/include/zaurus.inc +1 -1

index 7f12ac3..ee24900 100644
@@ -9,7 +9,7 @@ ERASEBLOCKSIZE_akita = "0x20000"
 # C3100 and C3200 have same 128MiB NAND device as akita
 ERASEBLOCKSIZE_spitz = "0x20000"
 
-IMAGE_FSTYPES += "tar.gz jffs2 sum.jffs2"
+IMAGE_FSTYPES ?= "tar.gz jffs2 sum.jffs2"
 
 # kernel now supports favourlzo
 EXTRA_IMAGECMD_jffs2 = "-p -l --eraseblock=${ERASEBLOCKSIZE}"

Signature · 1 line

1.7.8.3

Martin Jansa

author

2012-01-13 19:24 UTC #2 lore raw

PATCH 2/4 linux(-kexecboot)-git: upgrade to 3.2.0-rc7

Signed-off-by Martin Jansa <[email protected]>

---
 recipes-kernel/linux/linux-git.inc          |    4 ++--
 recipes-kernel/linux/linux-kexecboot_git.bb |    2 ++
 recipes-kernel/linux/linux/spitz/defconfig  |    7 +++++++
 recipes-kernel/linux/linux_git.bb           |    2 ++
 4 files changed, 13 insertions(+), 2 deletions(-)

recipes-kernel/linux/linux-git.inc +2 -2

index 66a6b9a..32a6d47 100644
@@ -1,8 +1,8 @@
-KERNEL_RELEASE = "3.2.0-rc3"
+KERNEL_RELEASE = "3.2.0-rc7"
 OLD_KERNEL_RELEASE = "3.1.99"
 PV = "${OLD_KERNEL_RELEASE}+${KERNEL_RELEASE}+gitr${SRCPV}"
 
-SRCREV = "caca6a03d365883564885f2c1da3e88dcf65d139"
+SRCREV = "371de6e4e0042adf4f9b54c414154f57414ddd37"
 
 CMDLINE_DEBUG = "debug"

recipes-kernel/linux/linux-kexecboot_git.bb +2 -0

index 1e8c56f..5671b4f 100644
@@ -1,2 +1,4 @@
 require linux-kexecboot.inc
 require linux-git.inc
+
+PR = "${INC_PR}.0"

recipes-kernel/linux/linux/spitz/defconfig +7 -0

index 90d49e9..dd1c0f5 100644
@@ -6,6 +6,13 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_IKCONFIG=m
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
+CONFIG_CGROUPS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_SCHED=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_RD_BZIP2=y
 CONFIG_RD_LZMA=y

recipes-kernel/linux/linux_git.bb +2 -0

index 256ee0e..620c4e4 100644
@@ -1,6 +1,8 @@
 require linux.inc
 require linux-git.inc
 
+PR = "${INC_PR}.0"
+
 SRC_URI_append_akita = " file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 "
 SRC_URI_append_c7x0 = " file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 "
 SRC_URI_append_collie = " file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 "

Signature · 1 line

1.7.8.3

Martin Jansa

author

2012-01-13 19:24 UTC #3 lore raw

PATCH 3/4 linux(-kexecboot)-3.2: add 3.2.1 for spitz

In reply to Martin Jansa

* for now with negative D_P
* be aware that current klibc doesn't build agains linux-headers from 3.2

Signed-off-by Martin Jansa <[email protected]>

---
 recipes-kernel/linux/linux-3.2.inc                 |   14 +
 recipes-kernel/linux/linux-3.2/spitz/defconfig     |  384 ++++++++++++++++++++
 .../linux/linux-kexecboot-3.2/spitz/defconfig      |  128 +++++++
 recipes-kernel/linux/linux-kexecboot_3.2.bb        |    5 +
 recipes-kernel/linux/linux_3.2.bb                  |    4 +
 5 files changed, 535 insertions(+), 0 deletions(-)
 create mode 100644 recipes-kernel/linux/linux-3.2.inc
 create mode 100644 recipes-kernel/linux/linux-3.2/spitz/defconfig
 create mode 100644 recipes-kernel/linux/linux-kexecboot-3.2/spitz/defconfig
 create mode 100644 recipes-kernel/linux/linux-kexecboot_3.2.bb
 create mode 100644 recipes-kernel/linux/linux_3.2.bb

recipes-kernel/linux/linux-3.2.inc new file +14 -0

new file mode 100644
index 0000000..8dd30d9
@@ -0,0 +1,14 @@
+DEFAULT_PREFERENCE = "-1"
+
+COMPATIBLE_MACHINE = "(spitz)"
+
+SRC_URI += "${KERNELORG_MIRROR}/linux/kernel/v3.x/linux-${PV}.tar.bz2;name=kernel \
+           ${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.1.bz2;apply=yes;name=stablepatch \
+           file://defconfig \
+           file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 \
+           "
+
+SRC_URI[kernel.md5sum] = "7ceb61f87c097fc17509844b71268935"
+SRC_URI[kernel.sha256sum] = "c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463"
+SRC_URI[stablepatch.md5sum] = "31fc34340f11118873463a1d59d47b7f"
+SRC_URI[stablepatch.sha256sum] = "e9a26dc5faa309ae5172e3c65081fa98b60befab160fb14d9a75816bbde15626"

recipes-kernel/linux/linux-3.2/spitz/defconfig new file +384 -0

384 lines not on this page · raw message

recipes-kernel/linux/linux-kexecboot-3.2/spitz/defconfig new file +128 -0

128 lines not on this page · raw message

recipes-kernel/linux/linux-kexecboot_3.2.bb new file +5 -0

new file mode 100644
index 0000000..8b4b9ce
@@ -0,0 +1,5 @@
+require linux-kexecboot.inc
+require linux-${PV}.inc
+
+PR = "${INC_PR}.0"
+S = "${WORKDIR}/linux-${PV}"

recipes-kernel/linux/linux_3.2.bb new file +4 -0

new file mode 100644
index 0000000..28564b6
@@ -0,0 +1,4 @@
+require linux.inc
+require linux-${PV}.inc
+
+PR = "${INC_PR}.0"

Signature · 1 line

1.7.8.3

Martin Jansa

author

2012-01-13 19:24 UTC #4 lore raw

PATCH 4/4 linux(-kexecboot)-3.1: move common stuff like SRC_URI and checksums to .inc file

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 recipes-kernel/linux/linux-3.1.inc          |   19 +++++++++++++++++++
 recipes-kernel/linux/linux-kexecboot_3.1.bb |   21 +--------------------
 recipes-kernel/linux/linux_3.1.bb           |   21 +--------------------
 3 files changed, 21 insertions(+), 40 deletions(-)
 create mode 100644 recipes-kernel/linux/linux-3.1.inc

recipes-kernel/linux/linux-3.1.inc new file +19 -0

new file mode 100644
index 0000000..a32fea0
@@ -0,0 +1,19 @@
+SRC_URI += "${KERNELORG_MIRROR}/linux/kernel/v3.x/linux-${PV}.tar.bz2;name=kernel \
+           ${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.7.bz2;apply=yes;name=stablepatch \
+           file://defconfig \
+           file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 \
+           "
+
+SRC_URI_append_collie = " \
+                         file://0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch \
+                         file://locomo_kbd_tweak-r2.patch \
+                         "
+
+SRC_URI_append_poodle = " \
+                         file://locomo_kbd_tweak-r2.patch \
+                         "
+
+SRC_URI[kernel.md5sum] = "8d43453f8159b2332ad410b19d86a931"
+SRC_URI[kernel.sha256sum] = "2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359"
+SRC_URI[stablepatch.md5sum] = "13ea1e611a0a580138b8203e6f1353ed"
+SRC_URI[stablepatch.sha256sum] = "44f2611ce923db17254eeb618ed06703acf4dd6dcc8357b360e11a1111b0bc9d"

recipes-kernel/linux/linux-kexecboot_3.1.bb +1 ~~-20~~

index 5da0cc4..f7a54fe 100644
@@ -1,26 +1,7 @@
 require linux-kexecboot.inc
+require linux-${PV}.inc
 
 PR = "${INC_PR}.4"
 S = "${WORKDIR}/linux-${PV}"
 
 COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)"
-
-SRC_URI += "${KERNELORG_MIRROR}/linux/kernel/v3.x/linux-${PV}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.7.bz2;apply=yes;name=stablepatch \
-           file://defconfig \
-           file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 \
-           "
-
-SRC_URI_append_collie = " \
-                         file://0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch \
-                         file://locomo_kbd_tweak-r2.patch \
-                         "
-
-SRC_URI_append_poodle = " \
-                         file://locomo_kbd_tweak-r2.patch \
-                         "
-
-SRC_URI[kernel.md5sum] = "8d43453f8159b2332ad410b19d86a931"
-SRC_URI[kernel.sha256sum] = "2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359"
-SRC_URI[stablepatch.md5sum] = "13ea1e611a0a580138b8203e6f1353ed"
-SRC_URI[stablepatch.sha256sum] = "44f2611ce923db17254eeb618ed06703acf4dd6dcc8357b360e11a1111b0bc9d"

recipes-kernel/linux/linux_3.1.bb +1 ~~-20~~

index 0c65f7b..5ac65ef 100644
@@ -1,25 +1,6 @@
 require linux.inc
+require linux-${PV}.inc
 
 PR = "${INC_PR}.5"
 
 COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz|h1940)"
-
-SRC_URI += "${KERNELORG_MIRROR}/linux/kernel/v3.x/linux-${PV}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.7.bz2;apply=yes;name=stablepatch \
-           file://defconfig \
-           file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 \
-           "
-
-SRC_URI_append_collie = " \
-                         file://0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch \
-                         file://locomo_kbd_tweak-r2.patch \
-                         "
-
-SRC_URI_append_poodle = " \
-                         file://locomo_kbd_tweak-r2.patch \
-                         "
-
-SRC_URI[kernel.md5sum] = "8d43453f8159b2332ad410b19d86a931"
-SRC_URI[kernel.sha256sum] = "2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359"
-SRC_URI[stablepatch.md5sum] = "13ea1e611a0a580138b8203e6f1353ed"
-SRC_URI[stablepatch.sha256sum] = "44f2611ce923db17254eeb618ed06703acf4dd6dcc8357b360e11a1111b0bc9d"

Signature · 1 line

1.7.8.3

Paul Eggleton

Applied

2012-01-14 20:22 UTC #5 lore raw

In reply to Martin Jansa

Quoted 27 lines · On Friday 13 January 2012 20:40:47 Martin Jansa wrote:

The following changes since commit d76030c7744dfb480c8d43073762d11dcae4893a:
linux(-kexecboot): upgrade from 3.1.6 to 3.1.7 (2012-01-05 08:49:23 +0000)
are available in the git repository at:
git://gitorious.org/shr/meta-handheld jansa/pull
Martin Jansa (4):
zaurus.inc: weak assignment to IMAGE_FSTYPES linux(-kexecboot)-git: upgrade to 3.2.0-rc7 linux(-kexecboot)-3.2: add 3.2.1 for spitz linux(-kexecboot)-3.1: move common stuff like SRC_URI and checksums
to .inc file
 conf/machine/include/zaurus.inc                    |    2 +-
 recipes-kernel/linux/linux-3.1.inc                 |   19 +
 recipes-kernel/linux/linux-3.2.inc                 |   14 +
 recipes-kernel/linux/linux-3.2/spitz/defconfig     |  384
++++++++++++++++++++ recipes-kernel/linux/linux-git.inc                 |  
 4 +-
 .../linux/linux-kexecboot-3.2/spitz/defconfig      |  128 +++++++
 recipes-kernel/linux/linux-kexecboot_3.1.bb        |   21 +-
 recipes-kernel/linux/linux-kexecboot_3.2.bb        |    5 +
 recipes-kernel/linux/linux-kexecboot_git.bb        |    2 +
 recipes-kernel/linux/linux/spitz/defconfig         |    7 +
 recipes-kernel/linux/linux_3.1.bb                  |   21 +-
 recipes-kernel/linux/linux_3.2.bb                  |    4 +

Quoted 8 lines

 recipes-kernel/linux/linux_git.bb                  |    2 +
 13 files changed, 570 insertions(+), 43 deletions(-)
 create mode 100644 recipes-kernel/linux/linux-3.1.inc
 create mode 100644 recipes-kernel/linux/linux-3.2.inc
 create mode 100644 recipes-kernel/linux/linux-3.2/spitz/defconfig
 create mode 100644 recipes-kernel/linux/linux-kexecboot-3.2/spitz/defconfig
create mode 100644 recipes-kernel/linux/linux-kexecboot_3.2.bb
 create mode 100644 recipes-kernel/linux/linux_3.2.bb

Merged to meta-handheld master, thanks!

Cheers,
Paul

Signature · 2 lines

Paul Eggleton
Intel Open Source Technology Centre