migrate recipes to meta-initramfs

PATCH New Andrea Adami 2 participants 8 messages Feb 21, 2012

Share & tools

Andrea Adami

author

2012-02-21 00:31 UTC #0 lore raw

cover migrate recipes to meta-initramfs

* Once the meta-initramfs layer will be in place,
* remove recipes which have been regrouped in the new
* layer and add appropriate .bbappends.

Andrea Adami (3):
meta-handheld: recipe moved to meta-initramfs, add bbappends

Signed-off-by Andrea Adami <[email protected]>

meta-handheld: remove initramfs-images, now in meta-initramfs
meta-handheld: remove linux-kexecboot_3.1 now in meta-initramfs

 recipes-bsp/images/initramfs-kexecboot-image.bb    |   28 ----
 .../images/initramfs-kexecboot-klibc-image.bb      |    5 -
 recipes-bsp/kexecboot/kexecboot-cfg/icon.xpm       |   43 ------
 recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb         |   61 --------
 recipes-bsp/kexecboot/kexecboot-handhelds.inc      |    6 +
 recipes-bsp/kexecboot/kexecboot-klibc_git.bb       |   12 --
 recipes-bsp/kexecboot/kexecboot-klibc_git.bbappend |    3 +
 recipes-bsp/kexecboot/kexecboot.inc                |   62 ---------
 recipes-bsp/kexecboot/kexecboot_git.bb             |    9 --
 recipes-bsp/kexecboot/kexecboot_git.bbappend       |    3 +
 ...xx_sharpsl-retain-ops-structure-on-collie.patch |   34 -----
 .../linux/linux-kexecboot-3.1/akita/defconfig      |  132 ------------------
 .../linux/linux-kexecboot-3.1/c7x0/defconfig       |  134 ------------------
 .../linux/linux-kexecboot-3.1/collie/defconfig     |  144 --------------------
 .../linux-kexecboot-3.1/locomo_kbd_tweak-r2.patch  |   66 ---------
 .../linux/linux-kexecboot-3.1/poodle/defconfig     |  136 ------------------
 .../linux/linux-kexecboot-3.1/spitz/defconfig      |  132 ------------------
 .../linux/linux-kexecboot-3.1/tosa/defconfig       |  134 ------------------
 recipes-kernel/linux/linux-kexecboot_3.1.bb        |    7 -
 recipes-kernel/linux/linux-kexecboot_3.1.bbappend  |   19 +++
 20 files changed, 31 insertions(+), 1139 deletions(-)
 delete mode 100644 recipes-bsp/images/initramfs-kexecboot-image.bb
 delete mode 100644 recipes-bsp/images/initramfs-kexecboot-klibc-image.bb
 delete mode 100644 recipes-bsp/kexecboot/kexecboot-cfg/icon.xpm
 delete mode 100644 recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb
 create mode 100644 recipes-bsp/kexecboot/kexecboot-handhelds.inc
 delete mode 100644 recipes-bsp/kexecboot/kexecboot-klibc_git.bb
 create mode 100644 recipes-bsp/kexecboot/kexecboot-klibc_git.bbappend
 delete mode 100644 recipes-bsp/kexecboot/kexecboot.inc
 delete mode 100644 recipes-bsp/kexecboot/kexecboot_git.bb
 create mode 100644 recipes-bsp/kexecboot/kexecboot_git.bbappend
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.1/0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.1/akita/defconfig
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.1/c7x0/defconfig
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.1/collie/defconfig
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.1/locomo_kbd_tweak-r2.patch
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.1/poodle/defconfig
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.1/spitz/defconfig
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.1/tosa/defconfig
 delete mode 100644 recipes-kernel/linux/linux-kexecboot_3.1.bb
 create mode 100644 recipes-kernel/linux/linux-kexecboot_3.1.bbappend

Signature · 1 line

1.7.3.4

Andrea Adami

author

2012-02-21 00:31 UTC #1 lore raw

PATCH 1/3 meta-handheld: recipe moved to meta-initramfs, add bbappends

Signed-off-by Andrea Adami <[email protected]>

---
 recipes-bsp/kexecboot/kexecboot-cfg/icon.xpm       |   43 --------------
 recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb         |   61 -------------------
 recipes-bsp/kexecboot/kexecboot-handhelds.inc      |    6 ++
 recipes-bsp/kexecboot/kexecboot-klibc_git.bb       |   12 ----
 recipes-bsp/kexecboot/kexecboot-klibc_git.bbappend |    3 +
 recipes-bsp/kexecboot/kexecboot.inc                |   62 --------------------
 recipes-bsp/kexecboot/kexecboot_git.bb             |    9 ---
 recipes-bsp/kexecboot/kexecboot_git.bbappend       |    3 +
 8 files changed, 12 insertions(+), 187 deletions(-)
 delete mode 100644 recipes-bsp/kexecboot/kexecboot-cfg/icon.xpm
 delete mode 100644 recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb
 create mode 100644 recipes-bsp/kexecboot/kexecboot-handhelds.inc
 delete mode 100644 recipes-bsp/kexecboot/kexecboot-klibc_git.bb
 create mode 100644 recipes-bsp/kexecboot/kexecboot-klibc_git.bbappend
 delete mode 100644 recipes-bsp/kexecboot/kexecboot.inc
 delete mode 100644 recipes-bsp/kexecboot/kexecboot_git.bb
 create mode 100644 recipes-bsp/kexecboot/kexecboot_git.bbappend

recipes-bsp/kexecboot/kexecboot-cfg/icon.xpm deleted +0 ~~-43~~

deleted file mode 100644
index 6e6fd77..0000000
@@ -1,43 +0,0 @@
-/* XPM */
-static char * icon_xpm[] = {
-"32 32 8 1",
-" 	c None",
-".	c #D6DBDE",
-"+	c #9BA6AE",
-"@	c #60727D",
-"#	c #B8BFC5",
-"$	c #A9E8F6",
-"%	c #12BCE4",
-"&	c #57D2EC",
-"                                ",
-"                                ",
-"                                ",
-"           .++@@@@++.           ",
-"         +@@@@@@@@@@@@+         ",
-"       #@@@@@@@@@@@@@@@@#       ",
-"      +@@@@@@@@@@@@@@@@@@+      ",
-"    .@@@@@@@@++##+@@@@@@@@@.    ",
-"    @@@@@@@.        .@@@@@@@    ",
-"   +@@@@@+    $$$$    #@@@@@+   ",
-"  #@@@@@.  $%%%%%%%%$  .@@@@@#  ",
-"  @@@@@.  &%%%%%%%%%%&  .@@@@@  ",
-" #@@@@+  %%%%%%%%%%%%%%  +@@@@# ",
-" @@@@@  &%%%%%%%%%%%%%%&  @@@@@ ",
-".@@@@. $%%%%%&   $%%%%%&  .@@@@.",
-"+@@@@  %%%%%    $%%%%%&    @@@@+",
-"+@@@+  %%%%$   $%%%%%&  $$ +@@@+",
-"@@@@+ $%%%%   $%%%%%&  $%$ +@@@@",
-"@@@@# &%%%&   &%%%%&  $%%& #@@@@",
-"@@@@. &%%%&   %%%%&  $%%%& .@@@@",
-"@@@@# $%%%&   &%%&   &%%%$ #@@@@",
-"+@@@+ $%%%%          %%%%$ +@@@+",
-"+@@@@  %%%%&        &%%%%  @@@@+",
-"#@@@@  &%%%%&      &%%%%&  @@@@#",
-" @@@@+  %%%%%%&$$&%%%%%%  +@@@@ ",
-" +@@@@. $%%%%%%%%%%%%%%$ .@@@@+ ",
-" .@@@@@  $%%%%%%%%%%%%$  @@@@@. ",
-"  #++++.   &%%%%%%%%&   .++++#  ",
-"            $&&%%&&$            ",
-"                                ",
-"                                ",
-"                                "};

recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb deleted +0 ~~-61~~

61 lines not on this page · raw message

recipes-bsp/kexecboot/kexecboot-handhelds.inc new file +6 -0

new file mode 100644
index 0000000..ab3deca
@@ -0,0 +1,6 @@
+EXTRA_OECONF_akita = "--enable-zaurus --enable-delay=2 --enable-evdev-rate=1000,250 --enable-fbui-width=480"
+EXTRA_OECONF_c7x0 = "--enable-zaurus --enable-delay=2 --enable-evdev-rate=1000,250 --enable-fbui-width=480"
+EXTRA_OECONF_spitz = "--enable-zaurus --enable-delay=3 --enable-evdev-rate=1000,250 --enable-fbui-width=480"
+EXTRA_OECONF_poodle = "--enable-zaurus --enable-delay=2 --enable-evdev-rate=1000,250"
+EXTRA_OECONF_tosa = "--enable-zaurus --enable-delay=2 --enable-evdev-rate=1000,250"
+EXTRA_OECONF_collie = "--enable-delay=2 --enable-evdev-rate=1000,250"

recipes-bsp/kexecboot/kexecboot-klibc_git.bb deleted +0 ~~-12~~

deleted file mode 100644
index 0d6d00f..0000000
@@ -1,12 +0,0 @@
-RDEPENDS_${PN} = "kexec-klibc"
-PV = "0.5.9"
-PR = "r8+gitr${SRCREV}"
-
-SRC_URI = "git://git.linuxtogo.org/home/groups/kexecboot/kexecboot.git;protocol=git "
-SRCREV = "8f1d3cc3d9c650c6a6c88f83071185d6ee0ef9c7"
-S = "${WORKDIR}/git"
-
-# the binary is statically linked against klibc
-inherit klibc
-
-require kexecboot.inc

recipes-bsp/kexecboot/kexecboot-klibc_git.bbappend new file +3 -0

new file mode 100644
index 0000000..61ba802
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+require kexecboot-handhelds.inc

recipes-bsp/kexecboot/kexecboot.inc deleted +0 ~~-62~~

62 lines not on this page · raw message

recipes-bsp/kexecboot/kexecboot_git.bb deleted +0 -9

deleted file mode 100644
index 1341461..0000000
@@ -1,9 +0,0 @@
-RDEPENDS_${PN} = "kexec"
-PV = "0.5.9"
-PR = "r8+gitr${SRCREV}"
-
-SRC_URI = "git://git.linuxtogo.org/home/groups/kexecboot/kexecboot.git;protocol=git "
-SRCREV = "8f1d3cc3d9c650c6a6c88f83071185d6ee0ef9c7"
-S = "${WORKDIR}/git"
-
-require kexecboot.inc

recipes-bsp/kexecboot/kexecboot_git.bbappend new file +3 -0

new file mode 100644
index 0000000..61ba802
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+require kexecboot-handhelds.inc

Signature · 1 line

1.7.3.4

Andrea Adami

author

2012-02-21 00:31 UTC #2 lore raw

PATCH 2/3 remove initramfs-images, now in meta-initramfs

In reply to Andrea Adami

Signed-off-by Andrea Adami <[email protected]>

---
 recipes-bsp/images/initramfs-kexecboot-image.bb    |   28 --------------------
 .../images/initramfs-kexecboot-klibc-image.bb      |    5 ---
 2 files changed, 0 insertions(+), 33 deletions(-)
 delete mode 100644 recipes-bsp/images/initramfs-kexecboot-image.bb
 delete mode 100644 recipes-bsp/images/initramfs-kexecboot-klibc-image.bb

recipes-bsp/images/initramfs-kexecboot-image.bb deleted +0 ~~-28~~

deleted file mode 100644
index f306fb5..0000000
@@ -1,28 +0,0 @@
-# Initramfs image providing kexecboot
-# a linux as bootloader implementation
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
-
-# avoid circular dependencies
-EXTRA_IMAGEDEPENDS = ""
-
-IMAGE_INSTALL = "kexec kexecboot"
-
-# Do not pollute the initrd image with rootfs features
-IMAGE_FEATURES = ""
-
-export IMAGE_BASENAME = "initramfs-kexecboot-image"
-
-IMAGE_LINGUAS = ""
-IMAGE_LOGIN_MANAGER = ""
-IMAGE_INIT_MANAGER = ""
-IMAGE_INITSCRIPTS = ""
-IMAGE_DEV_MANAGER = ""
-
-FEED_DEPLOYDIR_BASE_URI = ""
-ONLINE_PACKAGE_MANAGEMENT = "none"
-
-inherit image

recipes-bsp/images/initramfs-kexecboot-klibc-image.bb deleted +0 -5

deleted file mode 100644
index e81f9ee..0000000
@@ -1,5 +0,0 @@
-require initramfs-kexecboot-image.bb
-
-IMAGE_INSTALL = "kexec-klibc kexecboot-klibc"
-
-export IMAGE_BASENAME = "initramfs-kexecboot-klibc-image"

Signature · 1 line

1.7.3.4

Andrea Adami

author

2012-02-21 00:31 UTC #3 lore raw

PATCH 3/3 remove linux-kexecboot_3.1, now in meta-initramfs

In reply to Andrea Adami

* add .bbappend
* bump PR and INC_PR

Signed-off-by Andrea Adami <[email protected]>

---
 ...xx_sharpsl-retain-ops-structure-on-collie.patch |   34 -----
 .../linux/linux-kexecboot-3.1/akita/defconfig      |  132 ------------------
 .../linux/linux-kexecboot-3.1/c7x0/defconfig       |  134 ------------------
 .../linux/linux-kexecboot-3.1/collie/defconfig     |  144 --------------------
 .../linux-kexecboot-3.1/locomo_kbd_tweak-r2.patch  |   66 ---------
 .../linux/linux-kexecboot-3.1/poodle/defconfig     |  136 ------------------
 .../linux/linux-kexecboot-3.1/spitz/defconfig      |  132 ------------------
 .../linux/linux-kexecboot-3.1/tosa/defconfig       |  134 ------------------
 recipes-kernel/linux/linux-kexecboot_3.1.bb        |    7 -
 recipes-kernel/linux/linux-kexecboot_3.1.bbappend  |   19 +++
 10 files changed, 19 insertions(+), 919 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.1/0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.1/akita/defconfig
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.1/c7x0/defconfig
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.1/collie/defconfig
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.1/locomo_kbd_tweak-r2.patch
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.1/poodle/defconfig
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.1/spitz/defconfig
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.1/tosa/defconfig
 delete mode 100644 recipes-kernel/linux/linux-kexecboot_3.1.bb
 create mode 100644 recipes-kernel/linux/linux-kexecboot_3.1.bbappend

recipes-kernel/linux/linux-kexecboot-3.1/0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch deleted +0 ~~-34~~

deleted file mode 100644
index d86b47d..0000000
@@ -1,34 +0,0 @@
-From 31d99c4c9f14e571ca0e22c5862dd5b6a871e2dd Mon Sep 17 00:00:00 2001
-From: Dmitry Eremin-Solenikov <[email protected]>
-Date: Fri, 5 Aug 2011 15:32:23 +0400
-Subject: [PATCH] pcmcia/pxa2xx_sharpsl: retain ops structure on collie
-
-The pxa2xx_sharpsl driver part is also used on collie, which (as
-a StrongARM board) has different expectations for PCMCIA drivers.
-So, on collie place sharpsl_pcmcia_ops in .data section rather than
-in __initdata.
-
-Signed-off-by: Dmitry Eremin-Solenikov <[email protected]>
----
- drivers/pcmcia/pxa2xx_sharpsl.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c
-index 81af2b3..1b5b749 100644
---- a/drivers/pcmcia/pxa2xx_sharpsl.c
-+++ b/drivers/pcmcia/pxa2xx_sharpsl.c
-@@ -222,7 +222,11 @@ static void sharpsl_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
- 	sharpsl_pcmcia_init_reset(skt);
- }
- 
-+#ifdef CONFIG_SA1100_COLLIE
-+static struct pcmcia_low_level sharpsl_pcmcia_ops = {
-+#else
- static struct pcmcia_low_level sharpsl_pcmcia_ops __initdata = {
-+#endif
- 	.owner                  = THIS_MODULE,
- 	.hw_init                = sharpsl_pcmcia_hw_init,
- 	.hw_shutdown            = sharpsl_pcmcia_hw_shutdown,
--- 
-1.7.2.5
-

recipes-kernel/linux/linux-kexecboot-3.1/akita/defconfig deleted +0 ~~-132~~

132 lines not on this page · raw message

recipes-kernel/linux/linux-kexecboot-3.1/c7x0/defconfig deleted +0 ~~-134~~

134 lines not on this page · raw message

recipes-kernel/linux/linux-kexecboot-3.1/collie/defconfig deleted +0 ~~-144~~

144 lines not on this page · raw message

recipes-kernel/linux/linux-kexecboot-3.1/locomo_kbd_tweak-r2.patch deleted +0 ~~-66~~

66 lines not on this page · raw message

recipes-kernel/linux/linux-kexecboot-3.1/poodle/defconfig deleted +0 ~~-136~~

136 lines not on this page · raw message

recipes-kernel/linux/linux-kexecboot-3.1/spitz/defconfig deleted +0 ~~-132~~

132 lines not on this page · raw message

recipes-kernel/linux/linux-kexecboot-3.1/tosa/defconfig deleted +0 ~~-134~~

134 lines not on this page · raw message

recipes-kernel/linux/linux-kexecboot_3.1.bb deleted +0 -7

deleted file mode 100644
index 28dc370..0000000
@@ -1,7 +0,0 @@
-require linux-kexecboot.inc
-require linux-${PV}.inc
-
-PR = "${INC_PR}.7"
-S = "${WORKDIR}/linux-${PV}"
-
-COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)"

recipes-kernel/linux/linux-kexecboot_3.1.bbappend new file +19 -0

new file mode 100644
index 0000000..b3d83ef
@@ -0,0 +1,19 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)"
+
+# Note we set loglevel=3 and master console on serial to protect bootlogo.
+CMDLINE_c7x0 = "console=tty1 console=ttyS0,115200n8"
+CMDLINE_tosa = "console=tty1 console=ttyS0,115200n8"
+CMDLINE_poodle = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
+CMDLINE_akita = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
+CMDLINE_collie = "console=tty1 console=ttySA0,115200n8 fbcon=rotate:1 mem=64M"
+CMDLINE_spitz = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
+
+# Zaurus machines need kernel size-check.
+KERNEL_IMAGE_MAXSIZE_akita = "1294336"
+KERNEL_IMAGE_MAXSIZE_c7x0 = "1294336"
+KERNEL_IMAGE_MAXSIZE_collie = "1048576"
+KERNEL_IMAGE_MAXSIZE_poodle = "1294336"
+KERNEL_IMAGE_MAXSIZE_tosa = "1294336"
+KERNEL_IMAGE_MAXSIZE_spitz = "1294336"

Signature · 1 line

1.7.3.4

Andrea Adami

author

2012-02-21 22:28 UTC #4 lore raw

PATCH v2 3/3 remove linux-kexecboot_3.1, now in meta-initramfs

* add .bbappend
* bump PR and INC_PR

Signed-off-by Andrea Adami <[email protected]>

---
 recipes-kernel/linux/linux-kexecboot_3.1.bb       |    7 ----
 recipes-kernel/linux/linux-kexecboot_3.1.bbappend |   34 +++++++++++++++++++++
 2 files changed, 34 insertions(+), 7 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-kexecboot_3.1.bb
 create mode 100644 recipes-kernel/linux/linux-kexecboot_3.1.bbappend

recipes-kernel/linux/linux-kexecboot_3.1.bb deleted +0 -7

deleted file mode 100644
index 28dc370..0000000
@@ -1,7 +0,0 @@
-require linux-kexecboot.inc
-require linux-${PV}.inc
-
-PR = "${INC_PR}.7"
-S = "${WORKDIR}/linux-${PV}"
-
-COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)"

recipes-kernel/linux/linux-kexecboot_3.1.bbappend new file +34 -0

new file mode 100644
index 0000000..537715e
@@ -0,0 +1,34 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/linux-kexecboot-${PV}:"
+
+COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)"
+
+# Note we set loglevel=3 and master console on serial to protect bootlogo.
+CMDLINE_c7x0 = "console=tty1 console=ttyS0,115200n8"
+CMDLINE_tosa = "console=tty1 console=ttyS0,115200n8"
+CMDLINE_poodle = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
+CMDLINE_akita = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
+CMDLINE_collie = "console=tty1 console=ttySA0,115200n8 fbcon=rotate:1 mem=64M"
+CMDLINE_spitz = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
+
+# Zaurus machines need kernel size-check.
+KERNEL_IMAGE_MAXSIZE_akita = "1294336"
+KERNEL_IMAGE_MAXSIZE_c7x0 = "1294336"
+KERNEL_IMAGE_MAXSIZE_collie = "1048576"
+KERNEL_IMAGE_MAXSIZE_poodle = "1294336"
+KERNEL_IMAGE_MAXSIZE_tosa = "1294336"
+KERNEL_IMAGE_MAXSIZE_spitz = "1294336"
+
+SRC_URI += "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 \
+                         "
+
+

Signature · 1 line

1.7.3.4

Andrea Adami

author

2012-02-21 22:56 UTC #5 lore raw

PATCH v3 3/3 remove linux-kexecboot_3.1, now in meta-initramfs

In reply to Andrea Adami

* add .bbappend
* bump PR and INC_PR

Signed-off-by Andrea Adami <[email protected]>

---
 recipes-kernel/linux/linux-kexecboot_3.1.bb       |    7 ----
 recipes-kernel/linux/linux-kexecboot_3.1.bbappend |   36 +++++++++++++++++++++
 2 files changed, 36 insertions(+), 7 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-kexecboot_3.1.bb
 create mode 100644 recipes-kernel/linux/linux-kexecboot_3.1.bbappend

recipes-kernel/linux/linux-kexecboot_3.1.bb deleted +0 -7

deleted file mode 100644
index 28dc370..0000000
@@ -1,7 +0,0 @@
-require linux-kexecboot.inc
-require linux-${PV}.inc
-
-PR = "${INC_PR}.7"
-S = "${WORKDIR}/linux-${PV}"
-
-COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)"

recipes-kernel/linux/linux-kexecboot_3.1.bbappend new file +36 -0

new file mode 100644
index 0000000..74d63bb
@@ -0,0 +1,36 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/linux-kexecboot-${PV}:${THISDIR}/files:"
+
+COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)"
+
+# Note we set loglevel=3 and master console on serial to protect bootlogo.
+CMDLINE_c7x0 = "console=tty1 console=ttyS0,115200n8"
+CMDLINE_tosa = "console=tty1 console=ttyS0,115200n8"
+CMDLINE_poodle = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
+CMDLINE_akita = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
+CMDLINE_collie = "console=tty1 console=ttySA0,115200n8 fbcon=rotate:1 mem=64M"
+CMDLINE_spitz = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
+
+# Zaurus machines need kernel size-check.
+KERNEL_IMAGE_MAXSIZE_akita = "1294336"
+KERNEL_IMAGE_MAXSIZE_c7x0 = "1294336"
+KERNEL_IMAGE_MAXSIZE_collie = "1048576"
+KERNEL_IMAGE_MAXSIZE_poodle = "1294336"
+KERNEL_IMAGE_MAXSIZE_tosa = "1294336"
+KERNEL_IMAGE_MAXSIZE_spitz = "1294336"
+
+LOGO_SIZE ?= "."
+
+SRC_URI += "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 \
+                         "
+
+

Signature · 1 line

1.7.3.4

Martin Jansa

2012-02-21 23:00 UTC #6 lore raw

Re: [meta-handheld][PATCH v3 3/3] remove linux-kexecboot_3.1, now in meta-initramfs

Quoted 2 lines · Andrea Adami

* add .bbappend
* bump PR and INC_PR

AFAIK if you don't move all versions at once then 3.2 will always win (ignoring D_P between layers).

Cheers,

Quoted 72 lines

Signed-off-by Andrea Adami <[email protected]>

---
 recipes-kernel/linux/linux-kexecboot_3.1.bb       |    7 ----
 recipes-kernel/linux/linux-kexecboot_3.1.bbappend |   36 +++++++++++++++++++++
 2 files changed, 36 insertions(+), 7 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-kexecboot_3.1.bb
 create mode 100644 recipes-kernel/linux/linux-kexecboot_3.1.bbappend

recipes-kernel/linux/linux-kexecboot_3.1.bb deleted +0 -7

deleted file mode 100644
index 28dc370..0000000
@@ -1,7 +0,0 @@
-require linux-kexecboot.inc
-require linux-${PV}.inc
-
-PR = "${INC_PR}.7"
-S = "${WORKDIR}/linux-${PV}"
-
-COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)"

recipes-kernel/linux/linux-kexecboot_3.1.bbappend new file +36 -0

new file mode 100644
index 0000000..74d63bb
@@ -0,0 +1,36 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/linux-kexecboot-${PV}:${THISDIR}/files:"
+
+COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)"
+
+# Note we set loglevel=3 and master console on serial to protect bootlogo.
+CMDLINE_c7x0 = "console=tty1 console=ttyS0,115200n8"
+CMDLINE_tosa = "console=tty1 console=ttyS0,115200n8"
+CMDLINE_poodle = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
+CMDLINE_akita = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
+CMDLINE_collie = "console=tty1 console=ttySA0,115200n8 fbcon=rotate:1 mem=64M"
+CMDLINE_spitz = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
+
+# Zaurus machines need kernel size-check.
+KERNEL_IMAGE_MAXSIZE_akita = "1294336"
+KERNEL_IMAGE_MAXSIZE_c7x0 = "1294336"
+KERNEL_IMAGE_MAXSIZE_collie = "1048576"
+KERNEL_IMAGE_MAXSIZE_poodle = "1294336"
+KERNEL_IMAGE_MAXSIZE_tosa = "1294336"
+KERNEL_IMAGE_MAXSIZE_spitz = "1294336"
+
+LOGO_SIZE ?= "."
+
+SRC_URI += "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 \
+                         "
+
+

Signature · 7 lines

1.7.3.4


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Andrea Adami

author

2012-02-21 23:38 UTC #7 lore raw

Re: [meta-handheld][PATCH v3 3/3] remove linux-kexecboot_3.1, now in meta-initramfs

Quoted 8 lines · Martin Jansa

Quoted 2 lines · Andrea Adami
* add .bbappend
* bump PR and INC_PR
AFAIK if you don't move all versions at once then 3.2 will always win (ignoring D_P between layers).
Cheers,

In my case it does not happen: 3.1 is built.

BBLAYERS = " \
/oe/oe-core/meta \
/oe/meta-handheld \
/oe/meta-openembedded/meta-initramfs \
"

Cheers

Andrea

Quoted 82 lines

Quoted 69 lines
Signed-off-by Andrea Adami <[email protected]>
---
recipes-kernel/linux/linux-kexecboot_3.1.bb | 7 ---- recipes-kernel/linux/linux-kexecboot_3.1.bbappend | 36 +++++++++++++++++++++
 2 files changed, 36 insertions(+), 7 deletions(-)
delete mode 100644 recipes-kernel/linux/linux-kexecboot_3.1.bb create mode 100644 recipes-kernel/linux/linux-kexecboot_3.1.bbappend
recipes-kernel/linux/linux-kexecboot_3.1.bb deleted +0 -7
deleted file mode 100644
index 28dc370..0000000
@@ -1,7 +0,0 @@
-require linux-kexecboot.inc
-require linux-${PV}.inc
-
-PR = "${INC_PR}.7"
-S = "${WORKDIR}/linux-${PV}"
-
-COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)"
recipes-kernel/linux/linux-kexecboot_3.1.bbappend new file +36 -1
new file mode 100644
index 0000000..74d63bb
@@ -0,0 +1,36 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/linux-kexecboot-${PV}:${THISDIR}/files:"
+
+COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)"
+
+# Note we set loglevel=3 and master console on serial to protect bootlogo.
+CMDLINE_c7x0 = "console=tty1 console=ttyS0,115200n8"
+CMDLINE_tosa = "console=tty1 console=ttyS0,115200n8"
+CMDLINE_poodle = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
+CMDLINE_akita = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
+CMDLINE_collie = "console=tty1 console=ttySA0,115200n8 fbcon=rotate:1 mem=64M"
+CMDLINE_spitz = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
+
+# Zaurus machines need kernel size-check.
+KERNEL_IMAGE_MAXSIZE_akita = "1294336"
+KERNEL_IMAGE_MAXSIZE_c7x0 = "1294336"
+KERNEL_IMAGE_MAXSIZE_collie = "1048576"
+KERNEL_IMAGE_MAXSIZE_poodle = "1294336"
+KERNEL_IMAGE_MAXSIZE_tosa = "1294336"
+KERNEL_IMAGE_MAXSIZE_spitz = "1294336"
+
+LOGO_SIZE ?= "."
+
+SRC_URI += "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 \
+                         "
+
+
--
1.7.3.4
Quoted 4 lines
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: [email protected]
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel