From 54df19ea579338f80c6e092d49434cdced089fdf Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Sat, 9 Oct 2010 15:18:13 +0200
Subject: [PATCH 1/4] zaurus-utils: apply oe-stylize

---
 recipes/zaurus-utils/encdec-updater.bb          |   20 ++++++++--------
 recipes/zaurus-utils/nandlogical-klibc_1.0.0.bb |    4 +-
 recipes/zaurus-utils/nandlogical_1.0.0.bb       |    4 +-
 recipes/zaurus-utils/zaurus-installer.bb        |   23 ++++++++------------
 recipes/zaurus-utils/zaurus-legacy-tar.bb       |   15 +++++++------
 recipes/zaurus-utils/zaurus-updater.bb          |   26 +++++++++-------------
 6 files changed, 42 insertions(+), 50 deletions(-)

diff --git a/recipes/zaurus-utils/encdec-updater.bb b/recipes/zaurus-utils/encdec-updater.bb
index 7bd85c5..1fa7693 100644
--- a/recipes/zaurus-utils/encdec-updater.bb
+++ b/recipes/zaurus-utils/encdec-updater.bb
@@ -1,19 +1,19 @@
+DESCRIPTION = "A tool to encode and decode the Sharp Zaurus updater.sh script"
 SECTION = "console/utils"
 LICENSE = "GPL"
-DESCRIPTION = "A tool to encode and decode the Sharp Zaurus updater.sh script"
 
 SRC_URI = "file://encdec-updater.c"
 
-COMPATIBLE_MACHINE = '(poodle|c7x0|spitz|akita|tosa)'
-
-BBCLASSEXTEND = "native"
-NATIVE_INSTALL_WORKS = "1"
-
 do_compile() {
-	${CC} ${LDFLAGS} -o encdec-updater ${WORKDIR}/encdec-updater.c
+        ${CC} ${LDFLAGS} -o encdec-updater ${WORKDIR}/encdec-updater.c
 }
-
 do_install() {
-	install -d ${D}${bindir}
-	install -m 0755 encdec-updater ${D}${bindir}/
+        install -d ${D}${bindir}
+        install -m 0755 encdec-updater ${D}${bindir}/
 }
+
+BBCLASSEXTEND = "native"
+
+COMPATIBLE_MACHINE = "(poodle|c7x0|spitz|akita|tosa)"
+
+NATIVE_INSTALL_WORKS = "1"
diff --git a/recipes/zaurus-utils/nandlogical-klibc_1.0.0.bb b/recipes/zaurus-utils/nandlogical-klibc_1.0.0.bb
index 0f5e492..3f28589 100644
--- a/recipes/zaurus-utils/nandlogical-klibc_1.0.0.bb
+++ b/recipes/zaurus-utils/nandlogical-klibc_1.0.0.bb
@@ -1,9 +1,9 @@
 require nandlogical_${PV}.bb
 
-FILESPATHPKG =. "nandlogical:"
-
 inherit klibc
 
 do_compile() {
         ${CC} ${CFLAGS} ${LDFLAGS} -static -I${STAGING_INCDIR} nandlogical.c -o nandlogical
 }
+
+FILESPATHPKG =. "nandlogical:"
diff --git a/recipes/zaurus-utils/nandlogical_1.0.0.bb b/recipes/zaurus-utils/nandlogical_1.0.0.bb
index 9a6312c..0da2d23 100644
--- a/recipes/zaurus-utils/nandlogical_1.0.0.bb
+++ b/recipes/zaurus-utils/nandlogical_1.0.0.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Nandlogical for Sharp mtd1"
 LICENSE = "GPL"
-COMPATIBLE_MACHINE = "(poodle|c7x0|akita|spitz|tosa)"
 PR = "r4"
 
 SRC_URI = "file://nandlogical.c"
@@ -10,8 +9,9 @@ S = "${WORKDIR}"
 do_compile () {
         ${CC} ${CFLAGS} ${LDFLAGS} nandlogical.c -o nandlogical
 }
-
 do_install () {
         install -d ${D}${bindir}/
         install -m 0755 nandlogical ${D}${bindir}/
 }
+
+COMPATIBLE_MACHINE = "(poodle|c7x0|akita|spitz|tosa)"
diff --git a/recipes/zaurus-utils/zaurus-installer.bb b/recipes/zaurus-utils/zaurus-installer.bb
index d4fcdde..bc345c2 100644
--- a/recipes/zaurus-utils/zaurus-installer.bb
+++ b/recipes/zaurus-utils/zaurus-installer.bb
@@ -1,39 +1,34 @@
 DESCRIPTION = "Installkit for kexecboot-kernel"
+LICENSE = "zaurus-installer"
 DEPENDS = "${@base_conditional('MACHINE', 'collie', 'linux-kexecboot', 'zaurus-updater linux-kexecboot', d)}"
 DEPENDS += "${@base_conditional('MACHINE', 'spitz', 'zaurus-legacy-tar', '', d)}"
-LICENSE = "zaurus-installer"
 PR = "r4"
 
-PACKAGES = ""
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = '(collie|poodle|c7x0|spitz|akita|tosa)'
-
 do_compile() {
 }
 
-do_deploy() {
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+PACKAGES = ""
+
+# package_stagefile_shell need to run before populate_sysroot for packaged-staging
+addtask deploy before do_populate_sysroot after do_compile
 
+COMPATIBLE_MACHINE = "(collie|poodle|c7x0|spitz|akita|tosa)"
+
+do_deploy() {
         cd ${DEPLOY_DIR_IMAGE}
         rm -rf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}/
         mkdir installkit-${MACHINE}/
-
         [ -f "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin" ] && cp ${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin installkit-${MACHINE}/${KERNEL_IMAGETYPE}
-
         if [ ! "${MACHINE}" = "collie" ]; then
                 cp updater.sh installkit-${MACHINE}/updater.sh
         fi
-
         if [ "${MACHINE}" = "spitz" ]; then
                 cp ${DEPLOY_DIR_IMAGE}/gnu-tar installkit-${MACHINE}/gnu-tar
         fi
-
         tar czf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz installkit-${MACHINE}/
         md5sum ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz > ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz.md5
         rm -rf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}/
-
         package_stagefile_shell ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz
         package_stagefile_shell ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz.md5
 }
-
-# package_stagefile_shell need to run before populate_sysroot for packaged-staging
-addtask deploy before do_populate_sysroot after do_compile
diff --git a/recipes/zaurus-utils/zaurus-legacy-tar.bb b/recipes/zaurus-utils/zaurus-legacy-tar.bb
index 00d6cce..87d4f98 100644
--- a/recipes/zaurus-utils/zaurus-legacy-tar.bb
+++ b/recipes/zaurus-utils/zaurus-legacy-tar.bb
@@ -2,10 +2,6 @@ DESCRIPTION = "Legacy GNU-tar to unpack hd images on install for Zaurus spitz"
 LICENSE = "GPL"
 PR = "r0"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-PACKAGES = ""
-COMPATIBLE_MACHINE = "spitz"
-
 SRC_URI = "file://gnu-tar.gz"
 
 S = "${WORKDIR}"
@@ -13,11 +9,16 @@ S = "${WORKDIR}"
 do_compile() {
 }
 
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+PACKAGES = ""
+
+# package_stagefile_shell needs to run before populate_staging for packaged-staging
+addtask deploy before do_populate_sysroot after do_compile
+
+COMPATIBLE_MACHINE = "spitz"
+
 do_deploy() {
         install -d ${DEPLOY_DIR_IMAGE}
         install -m 0755 gnu-tar ${DEPLOY_DIR_IMAGE}/gnu-tar
         package_stagefile_shell ${DEPLOY_DIR_IMAGE}/gnu-tar
 }
-
-# package_stagefile_shell needs to run before populate_staging for packaged-staging
-addtask deploy before do_populate_sysroot after do_compile
diff --git a/recipes/zaurus-utils/zaurus-updater.bb b/recipes/zaurus-utils/zaurus-updater.bb
index ee41182..b13e2a3 100644
--- a/recipes/zaurus-utils/zaurus-updater.bb
+++ b/recipes/zaurus-utils/zaurus-updater.bb
@@ -1,17 +1,8 @@
 DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
-DEPENDS = "encdec-updater-native"
 LICENSE = "zaurus-updater"
+DEPENDS = "encdec-updater-native"
 PR = "r25"
 
-# even though the package is not machine-specific
-# we have to force it there to allow multimachine builds
-# because DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
-# and without this only the first machine built get the right staging ipk
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-PACKAGES = ""
-COMPATIBLE_MACHINE = '(poodle|c7x0|spitz|akita|tosa)'
-
 SRC_URI = "file://updater.sh"
 
 S = "${WORKDIR}"
@@ -19,17 +10,22 @@ S = "${WORKDIR}"
 do_configure() {
         sed -i "s/ZAURUS_UPDATER_VERSION/${PR}/" "${S}/updater.sh"
 }
-
 do_compile() {
         encdec-updater -e updater.sh
 }
 
+# even though the package is not machine-specific
+# we have to force it there to allow multimachine builds
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+PACKAGES = ""
+
+# package_stagefile_shell need to run before populate_sysroot for packaged-staging
+addtask deploy before do_populate_sysroot after do_compile
+
+COMPATIBLE_MACHINE = "(poodle|c7x0|spitz|akita|tosa)"
+
 do_deploy() {
         install -d ${DEPLOY_DIR_IMAGE}
         install -m 0755 updater.sh ${DEPLOY_DIR_IMAGE}/updater.sh
         package_stagefile_shell ${DEPLOY_DIR_IMAGE}/updater.sh
 }
-
-# package_stagefile_shell need to run before populate_sysroot for packaged-staging
-addtask deploy before do_populate_sysroot after do_compile
-
-- 
1.7.0.4

From 297adea3f338b17dd7a34f362236a2a5d430862a Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Sun, 10 Oct 2010 01:41:11 +0200
Subject: [PATCH 2/4] kexecboot: split kexecboot-klibc recipe and oe-stylize

---
 recipes/kexecboot/kexecboot-cfg_0.1.bb   |   33 ++++++++++-------------------
 recipes/kexecboot/kexecboot-klibc_git.bb |   13 +++++++++++
 recipes/kexecboot/kexecboot.inc          |   25 +++++++---------------
 recipes/kexecboot/kexecboot_git.bb       |    3 +-
 4 files changed, 35 insertions(+), 39 deletions(-)
 create mode 100644 recipes/kexecboot/kexecboot-klibc_git.bb

diff --git a/recipes/kexecboot/kexecboot-cfg_0.1.bb b/recipes/kexecboot/kexecboot-cfg_0.1.bb
index 0287cc9..ef16f31 100644
--- a/recipes/kexecboot/kexecboot-cfg_0.1.bb
+++ b/recipes/kexecboot/kexecboot-cfg_0.1.bb
@@ -1,44 +1,32 @@
-LICENSE = "GPL"
-SECTION = "base"
 DESCRIPTION = "Configuration file for kexecboot"
-
+SECTION = "base"
+LICENSE = "GPL"
 PR = "r9"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 SRC_URI = "file://icon.xpm"
 
 CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd"
 CMDLINE_CON_collie = "console=ttySA0,115200n8 console=tty1 noinitrd rw"
 CMDLINE_CON_qemuarm = "console=ttyAMA0,115200n8 console=tty1 noinitrd"
-
 CMDLINE_MEM = ""
 CMDLINE_MEM_collie = "mem=64M"
-
 CMDLINE_ROTATE = ""
 CMDLINE_ROTATE_spitz = "fbcon=rotate:1"
 CMDLINE_ROTATE_akita = "fbcon=rotate:1"
 CMDLINE_ROTATE_collie = "fbcon=rotate:1"
 CMDLINE_ROTATE_poodle = "fbcon=rotate:1"
-
-#CMDLINE_OTHER = "dyntick=enable"
 CMDLINE_OTHER = ""
-
-CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'
-
-CMDLINE = ${CMDLINE_CON}
-CMDLINE += ${CMDLINE_MEM}
-CMDLINE += ${CMDLINE_ROTATE}
-CMDLINE += ${CMDLINE_OTHER}
-CMDLINE += ${CMDLINE_DEBUG}
-
-FILES_${PN} += "/boot/*"
+CMDLINE_DEBUG = "${@base_conditional('DISTRO_TYPE', 'release', 'quiet', 'debug',d)}"
+CMDLINE = "${CMDLINE_CON}"
+CMDLINE += "${CMDLINE_MEM}"
+CMDLINE += "${CMDLINE_ROTATE}"
+CMDLINE += "${CMDLINE_OTHER}"
+CMDLINE += "${CMDLINE_DEBUG}"
 
 do_configure_prepend () {
     install -m 0644 ${WORKDIR}/icon.xpm ${S}
 }
-
 do_install_prepend () {
-
 echo '# Show this label in kexecboot menu.
 LABEL=${DISTRO}
 #
@@ -61,9 +49,12 @@ APPEND=${CMDLINE}
 # PRIORITY=10
 #' >> ${S}/boot.cfg
 }
-
 do_install () {
         install -d ${D}/boot
         install -m 0644 boot.cfg ${D}/boot/boot.cfg
         install -m 0644 icon.xpm ${D}/boot/icon.xpm
 }
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+FILES_${PN} += "/boot/*"
diff --git a/recipes/kexecboot/kexecboot-klibc_git.bb b/recipes/kexecboot/kexecboot-klibc_git.bb
new file mode 100644
index 0000000..d57f7e4
--- /dev/null
+++ b/recipes/kexecboot/kexecboot-klibc_git.bb
@@ -0,0 +1,13 @@
+RDEPENDS_${PN} = "kexec-klibc"
+PV = "0.5"
+PR = "r19+gitr${SRCREV}"
+
+SRC_URI = "git://git.linuxtogo.org/home/groups/kexecboot/kexecboot.git;protocol=git "
+
+SRCREV = "cd52db828d24a239698f142e9b028c6bc0d6a21a"
+S = "${WORKDIR}/git"
+
+# the binary is statically linked against klibc
+inherit klibc
+
+require kexecboot.inc
diff --git a/recipes/kexecboot/kexecboot.inc b/recipes/kexecboot/kexecboot.inc
index bdbc3a5..a55ff83 100644
--- a/recipes/kexecboot/kexecboot.inc
+++ b/recipes/kexecboot/kexecboot.inc
@@ -1,23 +1,13 @@
 LICENSE = "GPL"
 
-# the binary is statically linked against klibc
-inherit klibc
-inherit autotools
-
-RDEPENDS_${PN} = "kexec-klibc"
-
-# The binary itself is not machine-specific
-# but the EXTRA_OECONF overrides have this effect 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
 # You can create your own *-img.h by doing
 # ./make-image-header.sh <file>.png HAND
+# Defaults as in ver 0.5+0.6b
 
-SRC_URI += "file://logo-img.h \
-        file://logo.png \
-        "
+SRC_URI += "file://logo-img.h file://logo.png"
+
+inherit autotools
 
-# Defaults as in ver 0.5+0.6b
 #############################
 # Optional Features:
 #  --disable-option-checking  ignore unrecognized --enable/--with options
@@ -54,22 +44,23 @@ EXTRA_OECONF_c7x0 = "--with-zaurus"
 EXTRA_OECONF_spitz = "--with-zaurus"
 EXTRA_OECONF_poodle = "--with-zaurus"
 EXTRA_OECONF_tosa = "--with-zaurus"
-
 EXTRA_OECONF_omap3 = "--with-uimage"
 
 do_configure_prepend () {
         install -m 0644 ${WORKDIR}/logo-img.h ${S}/res/
         install -m 0644 ${WORKDIR}/logo.png ${S}/res/
 }
-
 do_install () {
         install -d ${D}${bindir}
         install -m 0755 kexecboot ${D}${bindir}/
-
         install -d ${D}/proc
         install -d ${D}/mnt
 }
 
+# The binary itself is not machine-specific
+# but the EXTRA_OECONF overrides have this effect
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
 FILES_${PN} += " ${bindir}/kexecboot /init /proc /mnt"
 
 pkg_postinst_${PN} () {
diff --git a/recipes/kexecboot/kexecboot_git.bb b/recipes/kexecboot/kexecboot_git.bb
index 8a282a0..6a3f8fd 100644
--- a/recipes/kexecboot/kexecboot_git.bb
+++ b/recipes/kexecboot/kexecboot_git.bb
@@ -1,9 +1,10 @@
+RDEPENDS_${PN} = "kexec"
 PV = "0.5"
 PR = "r19+gitr${SRCREV}"
 
 SRC_URI = "git://git.linuxtogo.org/home/groups/kexecboot/kexecboot.git;protocol=git "
-SRCREV = "cd52db828d24a239698f142e9b028c6bc0d6a21a"
 
+SRCREV = "cd52db828d24a239698f142e9b028c6bc0d6a21a"
 S = "${WORKDIR}/git"
 
 require kexecboot.inc
-- 
1.7.0.4

From 699c64b933f8564d9f5afcfde11a0f5de0a9a623 Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Sun, 10 Oct 2010 01:42:28 +0200
Subject: [PATCH 3/4] kexec-tools: explicit packaging of kexec and kdump

---
 recipes/kexec-tools/kexec-tools_2.0.2.bb |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/recipes/kexec-tools/kexec-tools_2.0.2.bb b/recipes/kexec-tools/kexec-tools_2.0.2.bb
index d9800b1..28ab240 100644
--- a/recipes/kexec-tools/kexec-tools_2.0.2.bb
+++ b/recipes/kexec-tools/kexec-tools_2.0.2.bb
@@ -1,6 +1,11 @@
 require kexec-tools_${PV}.inc
 
-PR = "r0"
+PR = "r1"
 
 EXTRA_OECONF = " --with-zlib=yes"
 export LDFLAGS = "-L${STAGING_LIBDIR}"
+
+PACKAGES =+ "kexec kdump"
+
+FILES_kexec = "${sbindir}/kexec"
+FILES_kdump = "${sbindir}/kdump"
-- 
1.7.0.4

From cf5a83f7fb41dc46b8ce624f22db4422a7937085 Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Sun, 10 Oct 2010 01:49:12 +0200
Subject: [PATCH 4/4] initramfs-kexecboot-klibc-image: klibc variant of initramfs-kexecboot-image

---
 recipes/images/initramfs-kexecboot-klibc-image.bb |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
 create mode 100644 recipes/images/initramfs-kexecboot-klibc-image.bb

diff --git a/recipes/images/initramfs-kexecboot-klibc-image.bb b/recipes/images/initramfs-kexecboot-klibc-image.bb
new file mode 100644
index 0000000..d8e92ca
--- /dev/null
+++ b/recipes/images/initramfs-kexecboot-klibc-image.bb
@@ -0,0 +1,3 @@
+require initramfs-kexecboot-image.bb
+
+IMAGE_INSTALL = "kexecboot-klibc"
-- 
1.7.0.4