More meta-oe tidying

index 89aeb92..c17ffde 100644
@@ -7,6 +7,8 @@ DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}depmod virtual/$
 INHIBIT_DEFAULT_DEPS = "1"
 
 KERNEL_IMAGETYPE ?= "zImage"
+INITRAMFS_IMAGE ?= ""
+INITRAMFS_TASK ?= ""
 
 python __anonymous () {
     kerneltype = bb.data.getVar('KERNEL_IMAGETYPE', d, 1) or ''

@@ -16,7 +18,7 @@ python __anonymous () {
     	bb.data.setVar("DEPENDS", depends, d)
 
     image = bb.data.getVar('INITRAMFS_IMAGE', d, True)
-    if image != '' and image is not None:
+    if image:
         bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d)
 
     machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True)

@@ -25,9 +27,6 @@ python __anonymous () {
        bb.data.setVar('PR', machine_kernel_pr, d)
 }
 
-INITRAMFS_IMAGE ?= ""
-INITRAMFS_TASK ?= ""
-
 inherit kernel-arch deploy
 
 PACKAGES_DYNAMIC += "kernel-module-*"

@@ -194,7 +193,7 @@ kernel_do_configure() {
 	yes '' | oe_runmake oldconfig
 
 	if [ ! -z "${INITRAMFS_IMAGE}" ]; then
-		for img in cpio.gz cpio.lzo cpio.lzma; do
+		for img in cpio.gz cpio.lzo cpio.lzma cpio.xz; do
 		if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" ]; then
 			cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" initramfs.$img
 		fi

@@ -202,7 +201,7 @@ kernel_do_configure() {
 	fi
 }
 
-kernel_do_configure[depends] += "${INITRAMFS_TASK}"
+do_configure[depends] += "${INITRAMFS_TASK}"
 
 do_menuconfig() {
         export DISPLAY='${DISPLAY}'

@@ -217,7 +216,7 @@ do_menuconfig() {
 	fi
 }
 do_menuconfig[nostamp] = "1"
-addtask menuconfig after do_patch
+addtask menuconfig after do_configure
 
 pkg_postinst_kernel () {
 	cd /${KERNEL_IMAGEDEST}; update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true

@@ -524,7 +523,7 @@ kernel_do_deploy() {
 }
 do_deploy[dirs] = "${DEPLOYDIR} ${B}"
 
-addtask deploy before do_package after do_install
+addtask deploy before do_build after do_install
 
 EXPORT_FUNCTIONS do_deploy
 

deleted file mode 100644
index 7283df8..0000000
@@ -1,109 +0,0 @@
-From 65780d06117be92941b3c5404dc31597b6807263 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <[email protected]>
-Date: Sun, 23 Jan 2011 10:58:46 +0100
-Subject: [PATCH] kernel bbclass: merge in OE improvements for mkimage, PR and initramfs
-
-Signed-off-by: Koen Kooi <[email protected]>
----
- classes/kernel.bbclass |   60 +++++++++++++++++++++++++++++++++++------------
- 1 files changed, 44 insertions(+), 16 deletions(-)
-
-diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
-index 827046e..d94930b 100644
---- a/classes/kernel.bbclass
-+++ b/classes/kernel.bbclass
-@@ -14,8 +14,20 @@ python __anonymous () {
-     	depends = bb.data.getVar("DEPENDS", d, 1)
-     	depends = "%s u-boot-mkimage-native" % depends
-     	bb.data.setVar("DEPENDS", depends, d)
-+
-+    image = bb.data.getVar('INITRAMFS_IMAGE', d, True)
-+    if image != '' and image is not None:
-+        bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d)
-+
-+    machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True)
-+
-+    if machine_kernel_pr:
-+       bb.data.setVar('PR', machine_kernel_pr, d)
- }
- 
-+INITRAMFS_IMAGE ?= ""
-+INITRAMFS_TASK ?= ""
-+
- inherit kernel-arch deploy
- 
- PACKAGES_DYNAMIC += "kernel-module-*"
-@@ -196,8 +208,17 @@ sysroot_stage_all_append() {
- 
- kernel_do_configure() {
-         yes '' | oe_runmake oldconfig
-+	if [ ! -z "${INITRAMFS_IMAGE}" ]; then
-+		for img in cpio.gz cpio.lzo cpio.lzma; do
-+		if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" ]; then
-+			cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" initramfs.$img
-+		fi
-+		done
-+	fi
- }
- 
-+kernel_do_configure[depends] += "${INITRAMFS_TASK}"
-+
- do_menuconfig() {
- 	export TERMWINDOWTITLE="${PN} Kernel Configuration"
- 	export SHELLCMDS="make menuconfig"
-@@ -476,6 +497,29 @@ do_sizecheck() {
- 
- addtask sizecheck before do_install after do_compile
- 
-+do_uboot_mkimage() {
-+    if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
-+        ENTRYPOINT=${UBOOT_ENTRYPOINT}
-+        if test -n "${UBOOT_ENTRYSYMBOL}"; then
-+            ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
-+                   awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'`
-+        fi
-+        if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
-+            ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
-+            uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage
-+            rm -f linux.bin
-+        else
-+            ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
-+            rm -f linux.bin.gz
-+            gzip -9 linux.bin
-+            uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage
-+            rm -f linux.bin.gz
-+        fi
-+    fi
-+}
-+
-+addtask uboot_mkimage before do_install after do_compile
-+
- KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
- # Don't include the DATETIME variable in the sstate package signatures
- KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
-@@ -487,22 +531,6 @@ kernel_do_deploy() {
- 		tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
- 	fi
- 
--	if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
--		if test -e arch/${ARCH}/boot/uImage ; then
--			cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
--		elif test -e arch/${ARCH}/boot/compressed/vmlinux ; then
--			${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
--			uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
--			rm -f linux.bin
--		else
--			${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
--			rm -f linux.bin.gz
--			gzip -9 linux.bin
--			uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
--			rm -f linux.bin.gz
--		fi
--	fi
--
- 	cd ${DEPLOYDIR}
- 	rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
- 	ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin
--- 
-1.6.6.1
-

deleted file mode 100644
index 3bbcfe9..0000000
@@ -1,33 +0,0 @@
-diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
-index d94930b..2a0f3da 100644
---- a/classes/kernel.bbclass
-+++ b/classes/kernel.bbclass
-@@ -220,6 +196,9 @@ kernel_do_configure() {
- kernel_do_configure[depends] += "${INITRAMFS_TASK}"
- 
- do_menuconfig() {
-+        export DISPLAY='${DISPLAY}'
-+        export DBUS_SESSION_BUS_ADDRESS='${DBUS_SESSION_BUS_ADDRESS}'
-+        export XAUTHORITY='${XAUTHORITY}'
- 	export TERMWINDOWTITLE="${PN} Kernel Configuration"
- 	export SHELLCMDS="make menuconfig"
- 	${TERMCMDRUN}
-@@ -318,13 +297,16 @@ module_conf_rfcomm = "alias bt-proto-3 rfcomm"
- 
- python populate_packages_prepend () {
- 	def extract_modinfo(file):
--		import re
--		tmpfile = os.tmpnam()
-+		import tempfile, re
-+		tempfile.tempdir = bb.data.getVar("WORKDIR", d, 1)
-+		tf = tempfile.mkstemp()
-+		tmpfile = tf[1]
- 		cmd = "PATH=\"%s\" %sobjcopy -j .modinfo -O binary %s %s" % (bb.data.getVar("PATH", d, 1), bb.data.getVar("HOST_PREFIX", d, 1) or "", file, tmpfile)
- 		os.system(cmd)
- 		f = open(tmpfile)
- 		l = f.read().split("\000")
- 		f.close()
-+		os.close(tf[0])
- 		os.unlink(tmpfile)
- 		exp = re.compile("([^=]+)=(.*)")
- 		vals = {}

deleted file mode 100644
index 8eb78a9..0000000
@@ -1,32 +0,0 @@
-DESCRIPTION = "A general purpose cryptographic library based on the code from GnuPG"
-HOMEPAGE = "http://directory.fsf.org/project/libgcrypt/"
-BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
-SECTION = "libs"
-
-BBCLASSEXTEND = "native"
-
-# helper program gcryptrnd and getrandom are under GPL, rest LGPL
-LICENSE = "GPLv2+ & LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-                    file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff"
-
-DEPENDS = "libgpg-error"
-
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \
-           file://add-pkgconfig-support.patch"
-
-inherit autotools binconfig pkgconfig
-
-EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
-
-# libgcrypt.pc is added locally and thus installed here
-do_install_append() {
-	install -d ${D}/${libdir}/pkgconfig
-	install -m 0644 ${S}/src/libgcrypt.pc ${D}/${libdir}/pkgconfig/
-}
-
-ARM_INSTRUCTION_SET = "arm"
-
-# move libgcrypt-config into -dev package
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${bindir} ${libdir}/pkgconfig/*.pc"

49 lines not on this page · raw message

deleted file mode 100644
index a592437..0000000
@@ -1,3 +0,0 @@
-require libgcrypt.inc
-
-PR = "r0"

new file mode 100644
index 0000000..d9172b4
@@ -0,0 +1,2 @@
+BBCLASSEXTEND = "native"
+

deleted file mode 100644
index 49e47d8..0000000
@@ -1,53 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
-Index: libgpg-error-1.8/configure.ac
-===================================================================
---- libgpg-error-1.8.orig/configure.ac	2010-05-06 06:01:08.000000000 -0700
-+++ libgpg-error-1.8/configure.ac	2010-07-21 02:20:20.923261305 -0700
-@@ -140,6 +140,7 @@
- AC_SUBST(GPG_ERROR_CONFIG_CFLAGS)
- AC_SUBST(GPG_ERROR_CONFIG_ISUBDIRAFTER)
- AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config])
-+AC_CONFIG_FILES([src/gpg-error.pc])
- 
- 
- # Special defines for certain platforms
-Index: libgpg-error-1.8/src/Makefile.am
-===================================================================
---- libgpg-error-1.8.orig/src/Makefile.am	2010-04-14 02:16:44.000000000 -0700
-+++ libgpg-error-1.8/src/Makefile.am	2010-07-21 02:22:36.655012496 -0700
-@@ -37,13 +37,15 @@
- bin_SCRIPTS = gpg-error-config
- m4datadir = $(datadir)/aclocal
- m4data_DATA = gpg-error.m4
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = gpg-error.pc
- 
- EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \
- 	mkerrnos.awk errnos.in README \
- 	mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \
- 	mkheader.awk gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \
- 	err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 \
--	gpg-error.def.in versioninfo.rc.in
-+	gpg-error.def.in versioninfo.rc.in gpg-error.pc.in
- 
- BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \
- 	err-sources-sym.h err-codes-sym.h errnos-sym.h gpg-error.h \
-Index: libgpg-error-1.8/src/gpg-error.pc.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libgpg-error-1.8/src/gpg-error.pc.in	2010-07-21 02:20:20.923261305 -0700
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: gpg-error
-+Description: a library that defines common error values for all GnuPG components
-+Version: @VERSION@
-+Libs: -L{libdir} -lgpg-error
-+Cflags: -I${includedir}

new file mode 100644
index 0000000..d9172b4
@@ -0,0 +1,2 @@
+BBCLASSEXTEND = "native"
+

deleted file mode 100644
index 321c7b8..0000000
@@ -1,26 +0,0 @@
-DESCRIPTION = "a small library that defines common error values for all GnuPG components"
-HOMEPAGE = "http://www.gnupg.org/related_software/libgpg-error/"
-BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
-
-BBCLASSEXTEND = "native"
-
-LICENSE = "GPLv2+ & LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
-                    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-                    file://src/gpg-error.h;endline=23;md5=83c16c8f5cea85affa1ff270a6f4fcff \
-                    file://src/init.c;endline=20;md5=b69742f2a8827d494c6f6a4b1768416c"
-SRC_URI[md5sum] = "1d2005268a2f096db28cf9cf77b3229a"
-SRC_URI[sha256sum] = "bdfbf2677147239d2d26d4e37f44635d9fd97c133c9ef9fd9793a12a059508c5"
-
-SECTION = "libs"
-LICENSE = "GPLv2+ & LGPLv2.1+"
-PR = "r0"
-
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \
-           file://pkgconfig.patch;"
-
-# move libgpg-error-config into -dev package
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${bindir}/*"
-
-inherit autotools binconfig pkgconfig gettext

deleted file mode 100644
index 604e6ca..0000000
@@ -1,10 +0,0 @@
-DESCRIPTION = "An accessibility toolkit for GNOME."
-SECTION = "x11/libs"
-LICENSE = "LGPL"
-
-DEPENDS = "glib-2.0 gtk-doc-native"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-glibtest"
-

deleted file mode 100644
index 7efb4fe..0000000
@@ -1,19 +0,0 @@
-DESCRIPTION = "An accessibility toolkit for GNOME."
-SECTION = "x11/libs"
-LICENSE = "LGPLv2 & LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
-                    file://atk/atkutil.c;endline=20;md5=db21b0bdbef9da4dc6eb122debc9f9bc \
-                    file://atk/atk.h;endline=20;md5=c58238d688c24387376d6c69d06248a7
-PR = "r1"
-
-inherit gnome
-
-SRC_URI[archive.md5sum] = "548d413775819fef425410739041cac3"
-SRC_URI[archive.sha256sum] = "92b9b1213cafc68fe9c3806273b968c26423237d7b1f631dd83dc5270b8c268c"
-
-DEPENDS = "glib-2.0 gtk-doc-native"
-
-EXTRA_OECONF += "--disable-glibtest"
-
-BBCLASSEXTEND = "native"
-

new file mode 100644
index 0000000..d9172b4
@@ -0,0 +1,2 @@
+BBCLASSEXTEND = "native"
+