[oe-commits] org.oe.dev merge of '0693b64dbb432d884ac6897aaa6c97de6bc99af3'
oe commit
openembedded-commits at lists.openembedded.org
Fri Feb 15 17:32:58 UTC 2008
merge of '0693b64dbb432d884ac6897aaa6c97de6bc99af3'
and '706ca8a56360cf090b26c74d6dc02843def49575'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 5298691784024e845135b17a0613495c22075e0d
ViewMTN: http://monotone.openembedded.org/revision/info/5298691784024e845135b17a0613495c22075e0d
Files:
1
packages/initrdscripts/kernel-initramfs_1.0.bb
classes/kernel.bbclass
conf/distro/chinook-compat.conf
Diffs:
#
# mt diff -r0693b64dbb432d884ac6897aaa6c97de6bc99af3 -r5298691784024e845135b17a0613495c22075e0d
#
#
#
# add_file "packages/initrdscripts/kernel-initramfs_1.0.bb"
# content [349b1a158cd6e3c05eab0efe1dd9e719b8d22f13]
#
# patch "classes/kernel.bbclass"
# from [c1ba23ede74eda992c8e621d047fa3f982ea6506]
# to [6eb314eeb40f044c37be9df698f02b9c149aa6f8]
#
============================================================
--- packages/initrdscripts/kernel-initramfs_1.0.bb 349b1a158cd6e3c05eab0efe1dd9e719b8d22f13
+++ packages/initrdscripts/kernel-initramfs_1.0.bb 349b1a158cd6e3c05eab0efe1dd9e719b8d22f13
@@ -0,0 +1,48 @@
+DESCRIPTION = "A kernel with internal initramfs"
+PR = "r1"
+
+#inherit kernel
+KERNEL_IMAGETYPE ?= "zImage"
+
+# Name of initramfs recipe to build and put result into kernel
+KERNEL_INITRAMFS ?= "initramfs-image"
+
+do_compile() {
+ cd ${TOPDIR}; DISTRO=${USERDISTRO} MACHINE=${MACHINE} ANGSTROM_MODE=uclibc IMAGE_FSTYPES=cpio.gz DEPLOY_TO=${WORKDIR}/initramfs.bin bitbake ${KERNEL_INITRAMFS} -c deploy_to
+ cd ${TOPDIR}; DISTRO=${USERDISTRO} MACHINE=${MACHINE} INITRAMFS_LOC=${WORKDIR}/initramfs.bin DEPLOY_TO=${WORKDIR}/\${KERNEL_IMAGE_BASE_NAME} bitbake virtual/kernel -c builtin_initramfs
+}
+
+do_install() {
+ install -d ${D}/boot/
+ install -m 644 ${WORKDIR}/${KERNEL_IMAGETYPE}* ${D}/boot/${KERNEL_IMAGETYPE}-${@get_pv(d)}
+}
+
+def get_version(d):
+ import bb
+ import os
+ dest = bb.data.getVar("WORKDIR", d, 1)
+ try:
+ files = os.listdir(dest)
+ files = filter(lambda f:f.startswith("zImage-"), files)
+ ver = files[0][len("zImage-"):]
+ return ver
+ except:
+ return "dum-m-y"
+
+def get_pv(d):
+ ver = get_version(d)
+ verc = ver.split("-")
+ return verc[0] + "-" + verc[1]
+
+def get_pr(d):
+ ver = get_version(d)
+ verc = ver.split("-")
+ return verc[2]
+
+PACKAGES = "kernel-image"
+FILES_kernel-image = "/boot/*"
+PKG_kernel-image = "kernel-image-${@get_pv(d)}"
+PKGPV_kernel-image = "${@get_pv(d)}"
+PKGPR_kernel-image = "${@get_pr(d)}"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
============================================================
--- classes/kernel.bbclass c1ba23ede74eda992c8e621d047fa3f982ea6506
+++ classes/kernel.bbclass 6eb314eeb40f044c37be9df698f02b9c149aa6f8
@@ -11,6 +11,10 @@ KERNEL_IMAGETYPE ?= "zImage"
export OS = "${TARGET_OS}"
export CROSS_COMPILE = "${TARGET_PREFIX}"
KERNEL_IMAGETYPE ?= "zImage"
+# Base filename under which users see built kernel (i.e. deploy name)
+KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}"
+# Symlink basename pointing to the most recently built kernel for a machine
+KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}"
KERNEL_PRIORITY = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[-1]}"
@@ -30,6 +34,7 @@ KERNEL_LD = "${LD}${KERNEL_LDSUFFIX} ${H
KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX} ${HOST_CC_KERNEL_ARCH}"
KERNEL_LD = "${LD}${KERNEL_LDSUFFIX} ${HOST_LD_KERNEL_ARCH}"
+# Where built kernel lies in the kernel tree
KERNEL_OUTPUT = "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}"
KERNEL_IMAGEDEST = "boot"
@@ -60,6 +65,22 @@ kernel_do_compile() {
fi
}
+do_builtin_initramfs() {
+ unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
+ cp "${INITRAMFS_LOC}" usr/initramfs_data.cpio.gz
+ oe_runmake ${KERNEL_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}"
+ install -d ${DEPLOY_DIR_IMAGE}
+ mv ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.no-initramfs.bin
+ install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
+ # Make sure to kill injected initramfs, in case someone will do "-c compile -f"
+ rm usr/initramfs_data.cpio.gz
+
+ [ -n "${DEPLOY_TO}" ] && install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_TO}
+}
+addtask builtin_initramfs after do_compile
+# As it accepts external parameter(s), better make it unstamped
+do_builtin_initramfs[nostamp] = "1"
+
kernel_do_stage() {
ASMDIR=`readlink include/asm`
#
# mt diff -r706ca8a56360cf090b26c74d6dc02843def49575 -r5298691784024e845135b17a0613495c22075e0d
#
#
#
# patch "conf/distro/chinook-compat.conf"
# from [b947a8f2568d5737e4ac97e8f352727f74f5e52d]
# to [cc908008b4aa26b9b4c0e937044d55dd7905f01d]
#
============================================================
--- conf/distro/chinook-compat.conf b947a8f2568d5737e4ac97e8f352727f74f5e52d
+++ conf/distro/chinook-compat.conf cc908008b4aa26b9b4c0e937044d55dd7905f01d
@@ -83,7 +83,8 @@ PREFERRED_VERSION_gtk+ = "2.
PREFERRED_VERSION_atk = "1.18.0"
PREFERRED_VERSION_gtk+ = "2.10.14"
-PREFERRED_VERSION_gnome-vfs = "2.16"
+PREFERRED_VERSION_gnome-vfs = "2.16.3"
+
# 3.9.1 would be correct
PREFERRED_VERSION_gtkhtml-3.8 = "3.8.2"
PREFERRED_VERSION_libxml2 = "2.6.27"
@@ -99,12 +100,16 @@ PREFERRED_VERSION_gst-ffmpeg = "0.
# 0.11.3 would be correct ( + maemo patches)
PREFERRED_VERSION_gst-ffmpeg = "0.10.2"
+PREFERRED_VERSION_bluez-libs = "3.20"
+
PREFERRED_PROVIDER_virtual/db = "db"
PREFERRED_PROVIDER_virtual/db-native = "db-native"
PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
# This is a hack to avoid building mesa which crashes the compiler
PREFERRED_PROVIDER_virtual/libsdl = "libsdl-directfb"
+PREFERRED_VERSION_libsdl-directfb = "1.2.9"
+PREFERRED_VERSION_libsdl-image = "1.2.3"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
@@ -137,11 +142,6 @@ PREFERRED_PROVIDER_avahi = "avahi"
PREFERRED_PROVIDER_virtual/libqte2 = "qte-mt"
PREFERRED_PROVIDER_avahi = "avahi"
-# Prevent chosing jikes-native (until java bootstrap patch is merged).
-PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
-
-PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon"
-
PREFERRED_VERSION_libsoup = "2.2.7"
PREFERRED_VERSION_libglade = "2.4.2"
PREFERRED_VERSION_gnutls = "1.4.5"
@@ -150,6 +150,23 @@ PREFERRED_VERSION_gpe-scap = "1.3"
PREFERRED_VERSION_gpe-scap = "1.3"
+# various Maemo4 specific libraries
+PREFERRED_VERSION_mce-dev = "1.6.3"
+PREFERRED_VERSION_libosso = "2.13"
+PREFERRED_VERSION_libhildon = "1.99.0"
+PREFERRED_VERSION_libhildonmime = "1.10.0"
+PREFERRED_VERSION_libhildonfm = "1.9.46"
+PREFERRED_VERSION_hildon-thumbnail = "0.14"
+PREFERRED_VERSION_osso-gwconnect = "1.0.12"
+PREFERRED_VERSION_osso-gnome-vfs2 = "2.16.3"
+
+# Java stuff
+
+PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
+
+PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon"
+PREFERRED_VERSION_swt3.4-gtk-hildon = "3.3+3.4M5"
+
# Does not compile with the CodeSourcery compiler .. :(
PREFERRED_VERSION_kaffe = "1.1.8+cvs20080120"
PREFERRED_VERSION_kaffeh-native = "1.1.8+cvs20080120"
@@ -172,3 +189,11 @@ PKG_libsoup = "libsoup2.2-8"
PKG_zlib = "zlib1g"
PKG_libglade = "libglade2-0"
PKG_libsoup = "libsoup2.2-8"
+
+PKG_libsdl-image = "libsdl-image1.2"
+PKG_libsdl-directfb = "libsdl1.2"
+
+PKG_bluez-libs = "libbluetooth2"
+
+PKG_osso-ic-oss = "osso-ic"
+PKG_libconic = "libconic0"
More information about the Openembedded-commits
mailing list