[oe-commits] org.oe.dev merge of '0e7dafd4ba684994da9cbab0292dbd6e3c6be3ec'
hrw commit
openembedded-commits at lists.openembedded.org
Fri Jan 18 15:34:57 UTC 2008
merge of '0e7dafd4ba684994da9cbab0292dbd6e3c6be3ec'
and 'cc72cefccea1756ea052a54b2ec73e0ef6e3d9eb'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 3a67f100390e466ab011cf5a80420a3718e7efaa
ViewMTN: http://monotone.openembedded.org/revision/info/3a67f100390e466ab011cf5a80420a3718e7efaa
Files:
1
classes/kernel.bbclass
conf/machine/include/zaurus-clamshell.inc
packages/shared-mime-info/shared-mime-info.inc
packages/shared-mime-info/shared-mime-info_0.22.bb
packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
packages/gsm/files/stdint.patch
packages/gpephone/libgpephone_svn.bb
packages/freesmartphone/gsm0710muxd_svn.bb
packages/gsm/libgsmd-lips_svn.bb
Diffs:
#
# mt diff -r0e7dafd4ba684994da9cbab0292dbd6e3c6be3ec -r3a67f100390e466ab011cf5a80420a3718e7efaa
#
#
#
# patch "classes/kernel.bbclass"
# from [63f744845e75d5fb5dae11b765f31d30ad820ace]
# to [0a8f1fb021e05b2bb2d0d90220ce554ae65408c2]
#
# patch "conf/machine/include/zaurus-clamshell.inc"
# from [75189b78d2f98b4b5156904ea7515f88fcd23b77]
# to [afde6e834060ae2ba10a7a5aeaa7784d36353fda]
#
# patch "packages/shared-mime-info/shared-mime-info.inc"
# from [783f8dadff8583522cd4cd6c9a13cfc22f64cb30]
# to [4baa38901e2f7cf8040eb429a7cafcd28b933a89]
#
# patch "packages/shared-mime-info/shared-mime-info_0.22.bb"
# from [4a4dd32eca2c7a0ad2732a239a9cd96ba2c544ac]
# to [35c48f287c63c5d27cf293500c44c587918d1641]
#
# patch "packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb"
# from [d0ff8b4ceeb0e382d68cfb2d7c93a44c3c848ed8]
# to [d9610e0d8ddf3d6006d149a70760e9d6f5352195]
#
============================================================
--- classes/kernel.bbclass 63f744845e75d5fb5dae11b765f31d30ad820ace
+++ classes/kernel.bbclass 0a8f1fb021e05b2bb2d0d90220ce554ae65408c2
@@ -80,26 +80,13 @@ kernel_do_stage() {
mkdir -p ${STAGING_KERNEL_DIR}/include/pcmcia
cp -fR include/pcmcia/* ${STAGING_KERNEL_DIR}/include/pcmcia/
- if [ -d drivers/crypto ]; then
- mkdir -p ${STAGING_KERNEL_DIR}/drivers/crypto
- cp -fR drivers/crypto/* ${STAGING_KERNEL_DIR}/drivers/crypto/
- fi
+ for entry in drivers/crypto include/media include/acpi include/sound include/video; do
+ if [ -d $entry ]; then
+ mkdir -p ${STAGING_KERNEL_DIR}/$entry
+ cp -fR $entry/* ${STAGING_KERNEL_DIR}/$entry/
+ fi
+ done
- if [ -d include/media ]; then
- mkdir -p ${STAGING_KERNEL_DIR}/include/media
- cp -fR include/media/* ${STAGING_KERNEL_DIR}/include/media/
- fi
-
- if [ -d include/acpi ]; then
- mkdir -p ${STAGING_KERNEL_DIR}/include/acpi
- cp -fR include/acpi/* ${STAGING_KERNEL_DIR}/include/acpi/
- fi
-
- if [ -d include/sound ]; then
- mkdir -p ${STAGING_KERNEL_DIR}/include/sound
- cp -fR include/sound/* ${STAGING_KERNEL_DIR}/include/sound/
- fi
-
if [ -d drivers/sound ]; then
# 2.4 alsa needs some headers from this directory
mkdir -p ${STAGING_KERNEL_DIR}/include/drivers/sound
@@ -418,3 +405,17 @@ python populate_packages_prepend () {
packages.append(metapkg)
bb.data.setVar('PACKAGES', ' '.join(packages), d)
}
+
+# Support checking the kernel size since some kernels need to reside in partitions
+# with a fixed length or there is a limit in transferring the kernel to memory
+do_sizecheck() {
+ if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then
+ size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'`
+ if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
+ rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
+ die "This kernel (size=$size > ${KERNEL_IMAGE_MAXSIZE}) is too big for your device. Please reduce the size of the kernel by making more of it modular."
+ fi
+ fi
+}
+
+addtask sizecheck before do_install after do_compile
============================================================
--- conf/machine/include/zaurus-clamshell.inc 75189b78d2f98b4b5156904ea7515f88fcd23b77
+++ conf/machine/include/zaurus-clamshell.inc afde6e834060ae2ba10a7a5aeaa7784d36353fda
@@ -1,4 +1,3 @@
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
include conf/machine/include/tune-xscale.inc
EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
============================================================
--- packages/shared-mime-info/shared-mime-info.inc 783f8dadff8583522cd4cd6c9a13cfc22f64cb30
+++ packages/shared-mime-info/shared-mime-info.inc 4baa38901e2f7cf8040eb429a7cafcd28b933a89
@@ -1,6 +1,6 @@ LICENSE = "GPL"
SECTION = "base"
LICENSE = "GPL"
-DEPENDS = "libxml2 intltool-native"
+DEPENDS = "libxml2 intltool-native glib-2.0"
PR = "r0"
SRC_URI = "http://freedesktop.org/~hadess/shared-mime-info-${PV}.tar.bz2"
============================================================
--- packages/shared-mime-info/shared-mime-info_0.22.bb 4a4dd32eca2c7a0ad2732a239a9cd96ba2c544ac
+++ packages/shared-mime-info/shared-mime-info_0.22.bb 35c48f287c63c5d27cf293500c44c587918d1641
@@ -1,2 +1,3 @@ require shared-mime-info.inc
require shared-mime-info.inc
+PR = "r1"
============================================================
--- packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb d0ff8b4ceeb0e382d68cfb2d7c93a44c3c848ed8
+++ packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb d9610e0d8ddf3d6006d149a70760e9d6f5352195
@@ -1,9 +1,9 @@ PR="r2"
LICENSE = "GPL"
DESCRIPTION = "Transparent xcursor theme for handheld systems"
SECTION = "x11/base"
PR="r2"
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \
+SRC_URI = "http://matchbox-project.org/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \
file://use-relative-symlinks.patch;patch=1 \
file://fix_watch_cursor.patch;patch=1"
FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*"
#
# mt diff -rcc72cefccea1756ea052a54b2ec73e0ef6e3d9eb -r3a67f100390e466ab011cf5a80420a3718e7efaa
#
#
#
# delete "packages/gsm/files/stdint.patch"
#
# add_file "packages/gpephone/libgpephone_svn.bb"
# content [c3f4dfe67ee079fe71f23797fde9a011e9fa8fae]
#
# patch "packages/freesmartphone/gsm0710muxd_svn.bb"
# from [6e5e1fdfb04ba1e035eaf6f8c6f911ce99d8769c]
# to [03f62477a6bd8456dc0f7e5444bf0e62bf2575c3]
#
# patch "packages/gsm/libgsmd-lips_svn.bb"
# from [9ce3eff62bdc12b8fdc3880b21d14c4ddca11602]
# to [5a08648332d815a28b314d8a0046b2a0e629b0bd]
#
============================================================
--- packages/gpephone/libgpephone_svn.bb c3f4dfe67ee079fe71f23797fde9a011e9fa8fae
+++ packages/gpephone/libgpephone_svn.bb c3f4dfe67ee079fe71f23797fde9a011e9fa8fae
@@ -0,0 +1,14 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Base library for GPE phone environment."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+DEPENDS = "gtk+ gtk-doc dbus-glib"
+PV = "0.4+svnr-${SRCREV}"
+PR = "r0"
+
+SRC_URI = "${GPEPHONE_SVN}"
+inherit gpephone pkgconfig autotools
+
+do_stage () {
+ autotools_stage_all
+}
============================================================
--- packages/freesmartphone/gsm0710muxd_svn.bb 6e5e1fdfb04ba1e035eaf6f8c6f911ce99d8769c
+++ packages/freesmartphone/gsm0710muxd_svn.bb 03f62477a6bd8456dc0f7e5444bf0e62bf2575c3
@@ -1,9 +1,10 @@ PV = "0.0+svnr${SRCREV}"
DESCRIPTION = "gsm.07.10 muxer userspace daemon"
AUTHOR = "M. Dietrich"
SECTION = "console/network"
DEPENDS = "intltool-native dbus"
LICENSE = "GPL"
PV = "0.0+svnr${SRCREV}"
+PR = "r1"
SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=gsm0710muxd"
S = "${WORKDIR}/gsm0710muxd"
@@ -12,3 +13,8 @@ INITSCRIPT_PARAMS = "defaults 35"
INITSCRIPT_NAME = "gsm0710muxd"
INITSCRIPT_PARAMS = "defaults 35"
+
+do_install_append() {
+ chmod a+rx ${D}${sysconfdir}/init.d/gsm0710muxd
+}
+
============================================================
--- packages/gsm/libgsmd-lips_svn.bb 9ce3eff62bdc12b8fdc3880b21d14c4ddca11602
+++ packages/gsm/libgsmd-lips_svn.bb 5a08648332d815a28b314d8a0046b2a0e629b0bd
@@ -6,10 +6,9 @@ PV = "0.0+svnr${SRCREV}"
RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel libtapi libgsmd-dev"
PV = "0.0+svnr${SRCREV}"
-PR = "r2"
+PR = "r3"
SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/;module=gsm \
- file://stdint.patch;patch=1;pnum=0 \
file://gsmd \
file://default"
More information about the Openembedded-commits
mailing list