[oe-commits] org.oe.dev merge of '484354fc7d908c35f064448e992d669099255726'
hrw commit
openembedded-commits at lists.openembedded.org
Wed Aug 8 08:19:48 UTC 2007
merge of '484354fc7d908c35f064448e992d669099255726'
and 'f048a9bae79ea733471cb26e128894d77a0d80d6'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 101e6eac19d0386458366b1121296ec77262c99b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=101e6eac19d0386458366b1121296ec77262c99b
Files:
1
conf/machine/palmt680.conf
conf/machine/palmtc.conf
conf/machine/palmtt.conf
packages/libopie/libopie2_cvs.bb
packages/libqpe/libqpe-opie_cvs.bb
packages/glibc/eglibc-svn
packages/glibc/eglibc-svn/export-fcntl2.patch
packages/maemo3/hildon-thumbnail_0.11.bb
classes/package_deb.bbclass
classes/rootfs_deb.bbclass
conf/machine/at91sam9263ek.conf
packages/glibc/eglibc_svn.bb
packages/linux/linux-gta01.inc
packages/meta/meta-gpephone.bb
packages/openmoko2/openmoko-today2_svn.bb
packages/tasks/task-gpephone.bb
packages/uboot/uboot-openmoko_svn.bb
Diffs:
#
# mt diff -r484354fc7d908c35f064448e992d669099255726 -r101e6eac19d0386458366b1121296ec77262c99b
#
#
#
# patch "conf/machine/palmt680.conf"
# from [69ee49c52bab331c54d8e101461ea4c62b9af0db]
# to [d6f702aa03ef4316e408cf6d12cf43dfb5c0d5ea]
#
# patch "conf/machine/palmtc.conf"
# from [db3fb94e943a205af995e6f086a4c9ecbb2ccccf]
# to [061fdfe08f390e77f6d7841af1927fee2b4e26aa]
#
# patch "conf/machine/palmtt.conf"
# from [b4a69289be08bca3ad9e95e165f1bae4fa8c7b60]
# to [a8a3fe6c60b3e9ae29e0c65e0a07c4c0278a032d]
#
# patch "packages/libopie/libopie2_cvs.bb"
# from [5bb0e0ab2a48fe329bb2f0f14bf1d5f9e3b8af87]
# to [a94be26d8f4cea4cb409cb24d471a69ea87ec6dc]
#
# patch "packages/libqpe/libqpe-opie_cvs.bb"
# from [66eb84a06f4f226608fdaccbcc077ac5fb2e540e]
# to [40db0bc0edadaa721bf0f8ff5d4f3e3783448be9]
#
============================================================
--- conf/machine/palmt680.conf 69ee49c52bab331c54d8e101461ea4c62b9af0db
+++ conf/machine/palmt680.conf d6f702aa03ef4316e408cf6d12cf43dfb5c0d5ea
@@ -1,6 +1,6 @@
#@TYPE: Machine
#@NAME: Palm Treo 680
-#@DESCRIPTION: Machine configuration for the Palm TX
+#@DESCRIPTION: Machine configuration for the Palm Treo 680
require conf/machine/include/palm.conf
============================================================
--- conf/machine/palmtc.conf db3fb94e943a205af995e6f086a4c9ecbb2ccccf
+++ conf/machine/palmtc.conf 061fdfe08f390e77f6d7841af1927fee2b4e26aa
@@ -1,6 +1,6 @@
#@TYPE: Machine
#@NAME: Palm TC
-#@DESCRIPTION: Machine configuration for the Palm TX
+#@DESCRIPTION: Machine configuration for the Palm Tungsten C
require conf/machine/include/palm.conf
============================================================
--- conf/machine/palmtt.conf b4a69289be08bca3ad9e95e165f1bae4fa8c7b60
+++ conf/machine/palmtt.conf a8a3fe6c60b3e9ae29e0c65e0a07c4c0278a032d
@@ -1,6 +1,6 @@
#@TYPE: Machine
#@NAME: Palm Tungsten T
-#@DESCRIPTION: Machine configuration for Palm Zire 71
+#@DESCRIPTION: Machine configuration for Palm Tungsten T/T2
TARGET_ARCH = "arm"
PACKAGE_EXTRA_ARCHS = "armv5te"
============================================================
--- packages/libopie/libopie2_cvs.bb 5bb0e0ab2a48fe329bb2f0f14bf1d5f9e3b8af87
+++ packages/libopie/libopie2_cvs.bb a94be26d8f4cea4cb409cb24d471a69ea87ec6dc
@@ -1,7 +1,7 @@ require ${PN}.inc
require ${PN}.inc
-PV = "1.2.2+cvs${SRCDATE}"
-PR = "r10"
+PV = "${OPIE_CVS_PV}"
+PR = "r11"
DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/libqpe/libqpe-opie_cvs.bb 66eb84a06f4f226608fdaccbcc077ac5fb2e540e
+++ packages/libqpe/libqpe-opie_cvs.bb 40db0bc0edadaa721bf0f8ff5d4f3e3783448be9
@@ -1,7 +1,7 @@ require ${PN}.inc
require ${PN}.inc
-PV = "1.2.2+cvs${SRCDATE}"
-PR = "r10"
+PV = "${OPIE_CVS_PV}"
+PR = "r11"
SRC_URI = "${HANDHELDS_CVS};module=opie/library \
file://fix-titleheight.patch;patch=1 \
#
# mt diff -rf048a9bae79ea733471cb26e128894d77a0d80d6 -r101e6eac19d0386458366b1121296ec77262c99b
#
#
#
# add_dir "packages/glibc/eglibc-svn"
#
# add_file "packages/glibc/eglibc-svn/export-fcntl2.patch"
# content [232a933f488fb34d845ec2eda98267820b13d828]
#
# add_file "packages/maemo3/hildon-thumbnail_0.11.bb"
# content [db90db94f158c6f9299c00ebb889728d40b1d522]
#
# patch "classes/package_deb.bbclass"
# from [d9817556bc8d0216be0724c9e3aa9f9703d01496]
# to [2d8ea35906dd1ccfce507dbc0f44fdb6ed2335ec]
#
# patch "classes/rootfs_deb.bbclass"
# from [ea60c04636d188493ddb3bb12f1d3f28d078a109]
# to [879ba74c1e013701649d53858c52b79d09441ccd]
#
# patch "conf/machine/at91sam9263ek.conf"
# from [a12a160b9d47bf6628878f786ae1c756afbb45eb]
# to [a05a082216e3ac5ee08f1882e725c2f90a277700]
#
# patch "packages/glibc/eglibc_svn.bb"
# from [7e7af9967544d169df09feba995a642fc8897d1e]
# to [58b807f12553100239940bff59a0d4d5e378fd21]
#
# patch "packages/linux/linux-gta01.inc"
# from [e61ffbfbb60a872ecdc4780ba4e38014521061ed]
# to [7538e9a0489178797d787503f993d57517becf9c]
#
# patch "packages/meta/meta-gpephone.bb"
# from [5616cc47e3e0d4ea59d427615e48f24cf87967b8]
# to [811d0e10a68ab2a50e5b88603c3a99b90f7e4851]
#
# patch "packages/openmoko2/openmoko-today2_svn.bb"
# from [58011fb129f3c3326348b057bc5b238ac55794b0]
# to [f0230b08ffc42d89e2beb89f2688d27e306bd201]
#
# patch "packages/tasks/task-gpephone.bb"
# from [f9f153b76c41d1c7cbdede4a6a036b023870ac83]
# to [8ad1cb7e128bf7c713a3601294598f2f45cbdbf2]
#
# patch "packages/uboot/uboot-openmoko_svn.bb"
# from [c5df9ff220f06731e8a618a15ddf6868cc4204ef]
# to [7fb04be5e94ef40416414b3cfb7df47f13ab00b0]
#
============================================================
--- packages/glibc/eglibc-svn/export-fcntl2.patch 232a933f488fb34d845ec2eda98267820b13d828
+++ packages/glibc/eglibc-svn/export-fcntl2.patch 232a933f488fb34d845ec2eda98267820b13d828
@@ -0,0 +1,11 @@
+--- libc/io/Makefile.orig 2007-08-07 17:41:33.000000000 -0700
++++ libc/io/Makefile 2007-08-07 17:42:25.000000000 -0700
+@@ -23,7 +23,7 @@ subdir := io
+
+ headers := sys/stat.h bits/stat.h sys/statfs.h bits/statfs.h sys/vfs.h \
+ sys/statvfs.h bits/statvfs.h fcntl.h sys/fcntl.h bits/fcntl.h \
+- poll.h sys/poll.h bits/poll.h \
++ poll.h sys/poll.h bits/poll.h bits/fcntl2.h \
+ utime.h ftw.h fts.h sys/sendfile.h
+
+ routines := \
============================================================
--- packages/maemo3/hildon-thumbnail_0.11.bb db90db94f158c6f9299c00ebb889728d40b1d522
+++ packages/maemo3/hildon-thumbnail_0.11.bb db90db94f158c6f9299c00ebb889728d40b1d522
@@ -0,0 +1,25 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Nokia hildon thumbnail library"
+
+DEPENDS = "libhildonmime hildon-libs osso-thumbnail"
+
+PR = "r0"
+
+SRC_URI = "http://repository.maemo.org/pool/sardine/main/source/h/${PN}/${PN}_${PV}.tar.gz \
+ "
+
+inherit autotools pkgconfig lib_package
+
+S = "${WORKDIR}/${PV}"
+
+do_configure_prepend() {
+ # remove Werror from OSSO_CFLAGS
+ sed -i s:-Werror::g configure.ac
+ touch gtk-doc.make
+}
+
+do_stage() {
+ autotools_stage_all
+}
+
+
============================================================
--- classes/package_deb.bbclass d9817556bc8d0216be0724c9e3aa9f9703d01496
+++ classes/package_deb.bbclass 2d8ea35906dd1ccfce507dbc0f44fdb6ed2335ec
@@ -1,3 +1,7 @@
+#
+# Copyright 2006-2007 OpenedHand Ltd.
+#
+
inherit package
PACKAGE_EXTRA_DEPENDS += "dpkg-native fakeroot-native"
@@ -132,6 +136,7 @@ python do_package_deb () {
continue
controldir = os.path.join(root, 'DEBIAN')
bb.mkdirhier(controldir)
+ os.chmod(controldir, 0755)
try:
ctrlfile = file(os.path.join(controldir, 'control'), 'wb')
# import codecs
@@ -150,7 +155,7 @@ python do_package_deb () {
fields.append(["Priority: %s\n", ['PRIORITY']])
fields.append(["Maintainer: %s\n", ['MAINTAINER']])
fields.append(["Architecture: %s\n", ['TARGET_ARCH']])
- fields.append(["OE: %s\n", ['P']])
+ fields.append(["OE: %s\n", ['PN']])
fields.append(["Homepage: %s\n", ['HOMEPAGE']])
# Package, Version, Maintainer, Description - mandatory
============================================================
--- classes/rootfs_deb.bbclass ea60c04636d188493ddb3bb12f1d3f28d078a109
+++ classes/rootfs_deb.bbclass 879ba74c1e013701649d53858c52b79d09441ccd
@@ -1,3 +1,6 @@
+#
+# Copyright 2006-2007 Openedhand Ltd.
+#
do_rootfs[depends] += "dpkg-native:do_populate_staging apt-native:do_populate_staging"
@@ -52,21 +55,21 @@ fakeroot rootfs_deb_do_rootfs () {
}
if [ ! -z "${LINGUAS_INSTALL}" ]; then
- apt-get install glibc-localedata-i18n
- if [ $? -eq 1 ]; then
- exit 1
+ apt-get install glibc-localedata-i18n --force-yes --allow-unauthenticated
+ if [ $? -ne 0 ]; then
+ exit $?
fi
for i in ${LINGUAS_INSTALL}; do
- apt-get install $i
- if [ $? -eq 1 ]; then
- exit 1
+ apt-get install $i --force-yes --allow-unauthenticated
+ if [ $? -ne 0 ]; then
+ exit $?
fi
done
fi
if [ ! -z "${PACKAGE_INSTALL}" ]; then
for i in ${PACKAGE_INSTALL}; do
- apt-get install $i
+ apt-get install $i --force-yes --allow-unauthenticated
if [ $? -eq 1 ]; then
exit 1
fi
@@ -134,3 +137,7 @@ rootfs_deb_log_check() {
true
}
+remove_packaging_data_files() {
+ rm -rf ${IMAGE_ROOTFS}/usr/lib/ipkg/
+ rm -rf ${IMAGE_ROOTFS}/usr/dpkg/
+}
============================================================
--- conf/machine/at91sam9263ek.conf a12a160b9d47bf6628878f786ae1c756afbb45eb
+++ conf/machine/at91sam9263ek.conf a05a082216e3ac5ee08f1882e725c2f90a277700
@@ -11,9 +11,11 @@ USE_VT = "0"
#don't try to access tty1
USE_VT = "0"
-MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget screen"
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen"
# used by sysvinit_2
SERIAL_CONSOLE = "115200 ttyS0"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
require conf/machine/include/tune-arm926ejs.conf
============================================================
--- packages/glibc/eglibc_svn.bb 7e7af9967544d169df09feba995a642fc8897d1e
+++ packages/glibc/eglibc_svn.bb 58b807f12553100239940bff59a0d4d5e378fd21
@@ -1,10 +1,12 @@ DEFAULT_PREFERENCE = "-1"
require glibc.inc
DEFAULT_PREFERENCE = "-1"
-
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
PV = "2.6+svn${SRCDATE}"
SRC_URI = "svn://svn.eglibc.org;module=trunk \
- "
+ file://export-fcntl2.patch;patch=1 \
+ file://etc/ld.so.conf \
+ file://generate-supported.mk"
S = "${WORKDIR}/trunk/libc"
B = "${WORKDIR}/build-${TARGET_SYS}"
@@ -83,5 +85,51 @@ do_compile () {
)
}
+do_stage() {
+ rm -f ${STAGING_LIBDIR}/libc.so.6
+ oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
+ 'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
+ '${STAGING_LIBDIR}/libc.so.6' \
+ install-headers install-lib
+ install -d ${STAGING_INCDIR}/gnu \
+ ${STAGING_INCDIR}/bits \
+ ${STAGING_INCDIR}/rpcsvc
+ install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
+ install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
+ install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
+ for r in ${rpcsvc}; do
+ h=`echo $r|sed -e's,\.x$,.h,'`
+ install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
+ done
+ for i in libc.a libc_pic.a libc_nonshared.a; do
+ install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i"
+ done
+ echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
+ echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
+
+ rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
+ oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
+ 'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
+ '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
+ install-headers install-lib
+
+ install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
+ ${CROSS_DIR}/${TARGET_SYS}/include/bits \
+ ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
+ install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
+ install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
+ install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
+ for r in ${rpcsvc}; do
+ h=`echo $r|sed -e's,\.x$,.h,'`
+ install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
+ done
+
+ for i in libc.a libc_pic.a libc_nonshared.a; do
+ install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
+ done
+ echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
+ echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
+}
+
require glibc-package.bbclass
============================================================
--- packages/linux/linux-gta01.inc e61ffbfbb60a872ecdc4780ba4e38014521061ed
+++ packages/linux/linux-gta01.inc 7538e9a0489178797d787503f993d57517becf9c
@@ -93,6 +93,7 @@ do_deploy() {
rm -f linux.bin.gz
gzip -9 linux.bin
${STAGING_BINDIR_NATIVE}/uboot-mkimage -A arm -O linux -T kernel -C gzip -a 30008000 -e 30008000 -n "OpenMoko Kernel Image Neo1973(GTA01)" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
+ ln -sf ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE}-latest.bin
rm -f linux.bin.gz
}
============================================================
--- packages/meta/meta-gpephone.bb 5616cc47e3e0d4ea59d427615e48f24cf87967b8
+++ packages/meta/meta-gpephone.bb 811d0e10a68ab2a50e5b88603c3a99b90f7e4851
@@ -1,9 +1,8 @@ LICENSE = "MIT"
DESCRIPTION = "Meta-package for GPE Palmtop Environment Phone packages"
LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
RDEPENDS = "\
- gpe-base-depends \
gpephone-task-base \
gpephone-task-settings \
gpephone-task-pim \
============================================================
--- packages/openmoko2/openmoko-today2_svn.bb 58011fb129f3c3326348b057bc5b238ac55794b0
+++ packages/openmoko2/openmoko-today2_svn.bb f0230b08ffc42d89e2beb89f2688d27e306bd201
@@ -1,6 +1,8 @@ DEPENDS = "libmokoui2 libmokojournal2 st
DESCRIPTION = "The OpenMoko Application Launcher"
SECTION = "openmoko/pim"
DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm"
+RDEPENDS = "libedata-cal"
PV = "0.1.0+svn${SVNREV}"
+PR = "r1"
inherit openmoko2 gtk-icon-cache
============================================================
--- packages/tasks/task-gpephone.bb f9f153b76c41d1c7cbdede4a6a036b023870ac83
+++ packages/tasks/task-gpephone.bb 8ad1cb7e128bf7c713a3601294598f2f45cbdbf2
@@ -1,10 +1,9 @@ DESCRIPTION = "Task packages for GPE Pal
DESCRIPTION = "Task packages for GPE Palmtop Environment Phone Edition"
-PR = "r7"
+PR = "r8"
LICENSE = "MIT"
ALLOW_EMPTY = "1"
PACKAGES = "\
- gpephone-base-depends \
gpephone-task-base \
gpephone-task-settings \
gpephone-task-pim \
@@ -12,9 +11,6 @@ PACKAGES = "\
gpephone-task-apps \
gpephone-task-development"
-RDEPENDS_gpephone-base-depends = "\
- virtual/libx11"
-
RDEPENDS_gpephone-task-development = "\
rxvt-unicode \
gpe-terminal \
============================================================
--- packages/uboot/uboot-openmoko_svn.bb c5df9ff220f06731e8a618a15ddf6868cc4204ef
+++ packages/uboot/uboot-openmoko_svn.bb 7fb04be5e94ef40416414b3cfb7df47f13ab00b0
@@ -73,8 +73,10 @@ do_deploy () {
for mach in ${UBOOT_MACHINES}
do
install -m 0644 ${S}/u-boot_${mach}.bin ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin
+ ln -sf ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/uboot-${mach}-latest.bin
if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then
install -m 0644 ${S}/lowlevel_foo_${mach}.bin ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin
+ ln -sf ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/lowlevel-foo-${mach}-latest.bin
fi
done
install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage
More information about the Openembedded-commits
mailing list