[oe-commits] org.oe.dev merge of '9d6e060052df45c5be50896005c5b965f0d64900'
florian commit
openembedded-commits at lists.openembedded.org
Wed Jan 16 14:20:21 UTC 2008
merge of '9d6e060052df45c5be50896005c5b965f0d64900'
and 'c794a426d2a55b0c4b5f1f6fee90c8272bd266e9'
Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: c32d254617ffcc037ac8e1b813c7d23979d2cb1c
ViewMTN: http://monotone.openembedded.org/revision/info/c32d254617ffcc037ac8e1b813c7d23979d2cb1c
Files:
1
packages/linux/linux-ixp4xx/defconfig-2.6.23.12
packages/linux/linux-ixp4xx/defconfig-2.6.23.14
packages/linux/linux-ixp4xx_2.6.23.12.bb
packages/linux/linux-ixp4xx_2.6.23.14.bb
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git
packages/linux/linux-rp_2.6.23+2.6.24-rc0+git.bb
packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb
packages/base-files/base-files/openprotium
packages/freesmartphone
classes/concatenated-image.bbclass
files/device_table-minimal-add-md.txt
packages/apmd/apmd-3.2.2/90-wifi-off
packages/base-files/base-files/openprotium/fstab
packages/freesmartphone/gsm0710muxd_svn.bb
packages/gcc/gcc-4.2.2/fortran-libs-rpath-to-staging-hack.patch
packages/gcc/gcc-4.2.2/gcc-4.0.2-e300c2c3.patch
packages/initscripts/initscripts-1.0/openprotium/mountall.sh
packages/initscripts/initscripts-1.0/openprotium/umountfs
packages/initscripts/initscripts-1.0/openprotium/umountinitrd.sh
packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.23.14
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/hx2750_base-r31.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/pxa27x_overlay-r8.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/squashfs3.2-2.6.20-r0.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/versatile-armv6.patch
packages/linux/linux-storcenter/defconfig-2.6.15.7
packages/linux/linux-storcenter/kernel.patch-2.6.15.7
packages/linux/linux-storcenter_2.6.15.7.bb
packages/openprotium-init/files/initscripts/zleds
packages/tasks/task-openprotium.bb
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/openprotium.conf
conf/machine/include/ixp4xx.inc
conf/machine/storcenter.conf
packages/apmd/apmd_3.2.2.bb
packages/efl1/epdf_cvs.bb
packages/gcc/gcc-cross_4.2.2.bb
packages/gcc/gcc_4.2.2.bb
packages/images/openprotium-image.bb
packages/initscripts/initscripts-1.0/openprotium/checkroot.sh
packages/initscripts/initscripts-openprotium_1.0.bb
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-akita
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-c7x0
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-collie
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-poodle
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-spitz
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-tosa
packages/linux/linux-rp.inc
packages/linux/linux-rp_2.6.23.bb
packages/meta/openprotium-packages.bb
packages/ncurses/ncurses.inc
packages/ncurses/ncurses_5.3.bb
packages/ncurses/ncurses_5.4.bb
packages/openprotium-init/files/boot/disk
packages/openprotium-init/files/functions
packages/openprotium-init/openprotium-init_0.10.bb
packages/sccd/files/scc.h
packages/sccd/sccd_1.0.bb
packages/tasks/task-openmoko-feed.bb
mtn:execute
true
packages/gsm/files/stdint.patch
packages/gsm/libgsmd-lips_svn.bb
packages/gpephone/libmsgenabler2_svn.bb
packages/linux/linux-tornado-omap2/htctornado/defconfig
packages/meta/meta-toolchain-gpe-sbox.bb
packages/meta/meta-toolchain-gpe.bb
packages/meta/meta-toolchain-openmoko.bb
packages/meta/meta-toolchain-sbox.bb
packages/meta/meta-toolchain.bb
Diffs:
#
# mt diff -r9d6e060052df45c5be50896005c5b965f0d64900 -rc32d254617ffcc037ac8e1b813c7d23979d2cb1c
#
#
#
# rename "packages/linux/linux-ixp4xx/defconfig-2.6.23.12"
# to "packages/linux/linux-ixp4xx/defconfig-2.6.23.14"
#
# rename "packages/linux/linux-ixp4xx_2.6.23.12.bb"
# to "packages/linux/linux-ixp4xx_2.6.23.14.bb"
#
# rename "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git"
# to "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git"
#
# rename "packages/linux/linux-rp_2.6.23+2.6.24-rc0+git.bb"
# to "packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb"
#
# add_dir "packages/base-files/base-files/openprotium"
#
# add_dir "packages/freesmartphone"
#
# add_file "classes/concatenated-image.bbclass"
# content [897fc5e2f0161e2487f2603b709e8d9ce91d85c7]
#
# add_file "files/device_table-minimal-add-md.txt"
# content [ae6bd8642d9e518aab41355d5c27bdec63bafc6c]
#
# add_file "packages/apmd/apmd-3.2.2/90-wifi-off"
# content [dd2b60322fc6d9136495d7c41f7c1f9e73ed8937]
#
# add_file "packages/base-files/base-files/openprotium/fstab"
# content [a3a9a408f7e276985ac09ed6e14bf3e672676856]
#
# add_file "packages/freesmartphone/gsm0710muxd_svn.bb"
# content [eafe51eac49ac2790c536077488698261ee29452]
#
# add_file "packages/gcc/gcc-4.2.2/fortran-libs-rpath-to-staging-hack.patch"
# content [96ee0c885c5757fde97f61188ec0c799ae5c7b18]
#
# add_file "packages/gcc/gcc-4.2.2/gcc-4.0.2-e300c2c3.patch"
# content [84568712feddebdf1d7bf5b760367393b94cf58d]
#
# add_file "packages/initscripts/initscripts-1.0/openprotium/mountall.sh"
# content [d53ec5b8db4e854e32ae7bc9a2c949e2bb0d38cc]
#
# add_file "packages/initscripts/initscripts-1.0/openprotium/umountfs"
# content [749892a0259d793808e7b662b57ea68b0f8fe9c6]
#
# add_file "packages/initscripts/initscripts-1.0/openprotium/umountinitrd.sh"
# content [a3fa7aecc33c8f0216c2504ac53f053501e30697]
#
# add_file "packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.23.14"
# content [fedacb0b5361d6ea9af44c234bb391c39aa55eeb]
#
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/hx2750_base-r31.patch"
# content [9d52a94da2bc5efdbef91b8e0c297a7d5e5c9cf3]
#
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/pxa27x_overlay-r8.patch"
# content [50400c7a806a9483d297bfadce35b7608d9a8919]
#
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/squashfs3.2-2.6.20-r0.patch"
# content [16a42047b8f2cb7836925cbc7aca3977e1bfddad]
#
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/versatile-armv6.patch"
# content [4741cf31febeef15c0b7646588b288c097a3d14c]
#
# add_file "packages/linux/linux-storcenter/defconfig-2.6.15.7"
# content [89163e2e88f8d563be3ba43ba5d8d97af99ac6b9]
#
# add_file "packages/linux/linux-storcenter/kernel.patch-2.6.15.7"
# content [2b5b2af2a03b3d264a60553caafa60c4e64e3ce8]
#
# add_file "packages/linux/linux-storcenter_2.6.15.7.bb"
# content [c8d13191b10ec42a45a1dac552bc747a241b24ad]
#
# add_file "packages/openprotium-init/files/initscripts/zleds"
# content [3d4888975ea9811709433fbce07f001e26d19d28]
#
# add_file "packages/tasks/task-openprotium.bb"
# content [7090386f8c1b7a38d12c4fdb13407565d809e031]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [d33fc51f1ead3210a0b39d7a0f31a26c904cd333]
# to [1dcbc89e2e936afc986ff0b9b2342ea57e980a70]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [7a99a2a6c43c4d8082370e9dcbe481855f365a4d]
# to [8119c811984dd538a4b239217a82174295ecb22f]
#
# patch "conf/distro/openprotium.conf"
# from [d345e4ef53818feb39363427341b7abc8cfc6c1b]
# to [675a168a57ce9b21aa838b950b5ae0da07243da2]
#
# patch "conf/machine/include/ixp4xx.inc"
# from [20b9033235fa7a2b9c96df8d4a1bb3e47d6f29e0]
# to [9c98fc2f74fc897a24220ae930e0950d7832deb0]
#
# patch "conf/machine/storcenter.conf"
# from [622076dfe27a2f9b51f85d89b558236c937d2237]
# to [d6d0332b212ef555e874615f6b130151a4913bfc]
#
# patch "packages/apmd/apmd_3.2.2.bb"
# from [468e386d67d32dcf673ffd462940acdf206daeee]
# to [7e1be5e159f4f8ae062efeda347fda7056e83fc8]
#
# patch "packages/efl1/epdf_cvs.bb"
# from [9efa1ebb461046746f606f717f62c2d06eeda613]
# to [cdfb0f4cc3ec86c5aac3d06e8fc109d3fd5c92c2]
#
# patch "packages/gcc/gcc-cross_4.2.2.bb"
# from [db2829fa431c6b82c542cae426ddc639e77aa4db]
# to [bd6eaf9021e129dcbd70794a3e80ac820d764246]
#
# patch "packages/gcc/gcc_4.2.2.bb"
# from [53244c4e795291ca862fb5b92fb62d5191081c67]
# to [6bcef9ceeb471bcf1d54c4ae08e78e9b80d6a44c]
#
# patch "packages/images/openprotium-image.bb"
# from [738026dd8e8a9e3fe4c7be21ad6fad4da91da8a3]
# to [ab2373e1108751ee0b8e734687d6d4b87be44c6d]
#
# patch "packages/initscripts/initscripts-1.0/openprotium/checkroot.sh"
# from [be2c20e222501bc76ef7036e5fda2919945c459d]
# to [764ae12dffbfe2adf0892cb451a8bab8dd388bc9]
#
# patch "packages/initscripts/initscripts-openprotium_1.0.bb"
# from [f52645d9a73aa94d16e2d4624e3fbf409d7369c4]
# to [425b3202077871f3552305e98cd10aa8e644fa6f]
#
# patch "packages/linux/linux-ixp4xx_2.6.23.14.bb"
# from [91f144590f8e37b3d4894d7feebebb9a022be434]
# to [38b3f331081f461ab9c8b5951f4f95b08687509d]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-akita"
# from [4560f10f9dd70ee7bc009c083ad859551b0c517a]
# to [828611f21dd3772a9db45569a4333a5e08e90a87]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-c7x0"
# from [94163c88c3af2445025f92864e982346295b7374]
# to [76de453dac80746ab730d22aaf3f526cd2a99f26]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-collie"
# from [f8c89cefc2aacd273421cdd6abb162f6197a7640]
# to [d04adf43f4133208ae5284b94bbd81d1d721a81e]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-poodle"
# from [48b1f25f947c9d614a87810486a63edbaaeec93b]
# to [17c355fed953e68652a97c9e41af957bfa52f4f2]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-spitz"
# from [60f2f3675a8045720aebad8b900d6c464040e0e3]
# to [a4c61e81d4db69a81a8ad36c0e7dc5aeafd0bc6a]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-tosa"
# from [db15e2aa6464fd82b3b9a756eff0884b88791d0d]
# to [46bd890ef0de9d01529d9491080643eeda533fd7]
#
# patch "packages/linux/linux-rp.inc"
# from [8510326c44fc879b7ce77ca7c20f62ab901eae48]
# to [909451ef86b7f046c9e21dd9cc93f456381c98fd]
#
# patch "packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb"
# from [0dad9c9f8cd8741095ce3f11996fb46de85e1c66]
# to [076ea04844ab570db5f22cfc2d543f19f9f2af3d]
#
# patch "packages/linux/linux-rp_2.6.23.bb"
# from [08d45cd12fcab8632fad9c0dd6c9a29f3e37ca2b]
# to [7ed3a000ed87924d72bda9c03a39fe938b38f7db]
#
# patch "packages/meta/openprotium-packages.bb"
# from [8bb8ff3b1e2bf980e7c838dccfd08ab50c2aea53]
# to [950069360e5b3d79719a0f164a9ee2837f936142]
#
# patch "packages/ncurses/ncurses.inc"
# from [596e850f8a0d008dfb954fd473225fe0d33c8b81]
# to [2be0776267994e0ee952b0f848192aeb2bea1cd3]
#
# patch "packages/ncurses/ncurses_5.3.bb"
# from [14508c719340e8abe5ecf6248de70aeb7ac036b3]
# to [052fb93e19e1b24e9e78a03584a0bbb70ff3d822]
#
# patch "packages/ncurses/ncurses_5.4.bb"
# from [a2950eea2cdd28c32834e38f248e4bae8471d9c1]
# to [d7a699b05dcac9fa77a97c45d770d8d95b25c805]
#
# patch "packages/openprotium-init/files/boot/disk"
# from [9013d8fc4ac2debd474c52e9d86794b9d64cca74]
# to [83a37d36cafcd58705933a00ae01f29dc6ea504a]
#
# patch "packages/openprotium-init/files/functions"
# from [4b0704488f3f4dcbc4d79d07888c4d57870921e9]
# to [1fde4b0325e7b2ee523d41e8733c5c6176f0579c]
#
# patch "packages/openprotium-init/openprotium-init_0.10.bb"
# from [a82f9e20c41b709f3ffb67651d5ac9cb4951ea19]
# to [1aec976cda95b20c26da75d8c111432f03177fb1]
#
# patch "packages/sccd/files/scc.h"
# from [b3b2d52c3a3e0deb83006b5d638ee5f95f758460]
# to [c5a4e42c0bc8d7d35f7c65438f4a38807c58d512]
#
# patch "packages/sccd/sccd_1.0.bb"
# from [35d89f9c2cde0c60fbdc68234088261f3b976d5a]
# to [3942ef0f1578f30da141ac6e499613fb2d4f4930]
#
# patch "packages/tasks/task-openmoko-feed.bb"
# from [02d92dbdbb6c58dd3e7f980dd5aeda1082357007]
# to [1d446b5d0ff09d916f1a0edd5acc3f1b3fbd6d21]
#
# set "packages/initscripts/initscripts-1.0/openprotium/umountfs"
# attr "mtn:execute"
# value "true"
#
============================================================
--- classes/concatenated-image.bbclass 897fc5e2f0161e2487f2603b709e8d9ce91d85c7
+++ classes/concatenated-image.bbclass 897fc5e2f0161e2487f2603b709e8d9ce91d85c7
@@ -0,0 +1,38 @@
+
+#
+# define the FLASH_KERNEL_SIZE and FLASH_ROOT_SIZE in your machine.conf,
+# and this class builds a simple, padded concatenated image of
+# <kernel><padding><rootfs> and performs error checking that either
+# kernel or rootfs isn't too large to fit.
+#
+concat_pack_image() {
+ # find latest kernel - is there a more general way to do this?
+ KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}* | tail -n 1`
+ if [ -z "$KERNEL" ]; then
+ oefatal "No kernel found in ${DEPLOY_DIR_IMAGE}. Was expecting a ${KERNEL_IMAGETYPE}\* file."
+ exit 1
+ fi
+ ROOTFS=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2
+ OUTPUT=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flash.img
+ PADFILE=${DEPLOY_DIR_IMAGE}/padfile.zzz
+ KERNEL_SIZE_MAX_DEC=`echo ${FLASH_KERNEL_SIZE} | awk --non-decimal-data '{printf "%d\n", $1}' `
+ ROOT_SIZE_MAX_DEC=`echo ${FLASH_ROOT_SIZE} | awk --non-decimal-data '{printf "%d\n", $1}' `
+ KERNEL_SIZE=`ls -l $KERNEL | awk '{print $5}'`
+ if [ $KERNEL_SIZE -gt $KERNEL_SIZE_MAX_DEC ]; then
+ oefatal "Kernel too large at $KERNEL_SIZE bytes. Max is $KERNEL_SIZE_MAX_DEC."
+ exit 1
+ fi
+ ROOT_SIZE=`ls -l $ROOTFS | awk '{print $5}'`
+ if [ $ROOT_SIZE -gt $ROOT_SIZE_MAX_DEC ]; then
+ oefatal "Rootfs is too large at $ROOT_SIZE bytes. Max is $ROOT_SIZE_MAX_DEC."
+ exit 1
+ fi
+ PAD_SIZE=`echo "$KERNEL_SIZE_MAX_DEC - $KERNEL_SIZE" | bc `
+ dd if=/dev/zero of=$PADFILE bs=$PAD_SIZE count=1 2>>/dev/null
+ cat $KERNEL $PADFILE $ROOTFS > $OUTPUT
+ rm -f $PADFILE
+ ls -l $OUTPUT
+}
+
+IMAGE_POSTPROCESS_COMMAND += "concat_pack_image; "
+
============================================================
--- files/device_table-minimal-add-md.txt ae6bd8642d9e518aab41355d5c27bdec63bafc6c
+++ files/device_table-minimal-add-md.txt ae6bd8642d9e518aab41355d5c27bdec63bafc6c
@@ -0,0 +1,32 @@
+#<path> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>
+#/dev/mem c 640 0 0 1 1 0 0 -
+#
+#type can be one of:
+# f A regular file
+# d Directory
+# c Character special device file
+# b Block special device file
+# p Fifo (named pipe)
+
+/dev d 755 0 0 - - - - -
+/dev/initctl p 600 0 0 - - - - -
+/dev/apm_bios c 660 0 46 10 134 - - -
+/dev/fb0 c 600 0 0 29 0 - - -
+/dev/hda b 660 0 6 3 0 - - -
+/dev/hda b 660 0 6 3 1 1 1 5
+/dev/kmem c 640 0 15 1 2 - - -
+/dev/mem c 640 0 15 1 1 - - -
+/dev/null c 666 0 0 1 3 - - -
+/dev/ram b 640 0 0 1 0 0 1 4
+/dev/tty c 662 0 5 5 0 - - -
+/dev/tty c 666 0 5 4 0 0 1 9
+/dev/ttyS c 640 0 5 4 64 0 1 2
+/dev/ttySA c 640 0 5 204 5 0 1 1
+/dev/zero c 644 0 0 1 5 - - -
+/dev/mtd c 660 0 6 90 0 0 2 8
+/dev/mtdblock b 640 0 0 31 0 0 1 8
+/dev/console c 662 0 5 5 1 - - -
+/dev/random c 644 0 0 1 8 - - -
+/dev/urandom c 644 0 0 1 9 - - -
+/dev/ptmx c 644 0 0 5 2 - - -
+/dev/md b 644 0 0 9 0 0 1 4
============================================================
--- packages/apmd/apmd-3.2.2/90-wifi-off dd2b60322fc6d9136495d7c41f7c1f9e73ed8937
+++ packages/apmd/apmd-3.2.2/90-wifi-off dd2b60322fc6d9136495d7c41f7c1f9e73ed8937
@@ -0,0 +1,12 @@
+#!/bin/sh
+#Author: Rolf Leggewie
+#
+# turn off wifi cards before suspend so they are fully reloaded upon resume
+
+wifislot = `pccardctl ls|egrep '(hostap|orinoco)'|cut -f 2 -d " "`
+if test $wifislot
+then
+ for slot in $wifislot; do
+ pccardctl eject $wifislot
+ done
+fi
============================================================
--- packages/base-files/base-files/openprotium/fstab a3a9a408f7e276985ac09ed6e14bf3e672676856
+++ packages/base-files/base-files/openprotium/fstab a3a9a408f7e276985ac09ed6e14bf3e672676856
@@ -0,0 +1,11 @@
+rootfs / auto defaults 1 1
+proc /proc proc defaults 0 0
+devpts /dev/pts devpts mode=0620,gid=5 0 0
+usbfs /proc/bus/usb usbfs defaults 0 0
+#tmpfs /var/volatile tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
+#tmpfs /media/ram tmpfs defaults 0 0
+
+# uncomment this if your device has a SD/MMC/Transflash slot
+#/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
+
============================================================
--- packages/freesmartphone/gsm0710muxd_svn.bb eafe51eac49ac2790c536077488698261ee29452
+++ packages/freesmartphone/gsm0710muxd_svn.bb eafe51eac49ac2790c536077488698261ee29452
@@ -0,0 +1,14 @@
+DESCRIPTION = "gsm.07.10 muxer userspace daemon"
+AUTHOR = "M. Dietrich"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PV = "0.0+svnr${SRCREV}"
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=gsm0710muxd"
+S = "${WORKDIR}/gsm0710muxd"
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "gsm0710muxd"
+INITSCRIPT_PARAMS = "defaults 35"
============================================================
--- packages/gcc/gcc-4.2.2/fortran-libs-rpath-to-staging-hack.patch 96ee0c885c5757fde97f61188ec0c799ae5c7b18
+++ packages/gcc/gcc-4.2.2/fortran-libs-rpath-to-staging-hack.patch 96ee0c885c5757fde97f61188ec0c799ae5c7b18
@@ -0,0 +1,48 @@
+f951 (fortran) links to MPFR and GMP of our staging area but when executing
+the command the libs can not be found. Use rpath like all the other apps in
+our staging bin/ directory.
+
+Patch the configure to avoid the regeneration...
+
+Index: gcc-4.2.2/configure
+===================================================================
+--- gcc-4.2.2.orig/configure 2008-01-15 23:23:41.000000000 +0100
++++ gcc-4.2.2/configure 2008-01-15 23:25:20.000000000 +0100
+@@ -2278,14 +2278,14 @@
+
+
+ if test "x$with_mpfr" != x; then
+- gmplibs="-L$with_mpfr/lib $gmplibs"
++ gmplibs="-Wl,-rpath,$with_mpfr/lib -L$with_mpfr/lib $gmplibs"
+ gmpinc="-I$with_mpfr/include"
+ fi
+ if test "x$with_mpfr_include" != x; then
+ gmpinc="-I$with_mpfr_include"
+ fi
+ if test "x$with_mpfr_lib" != x; then
+- gmplibs="-L$with_mpfr_lib $gmplibs"
++ gmplibs="-Wl,-rpath,$with_mpfr_lib -L$with_mpfr_lib $gmplibs"
+ fi
+
+ # Specify a location for gmp
+Index: gcc-4.2.2/configure.in
+===================================================================
+--- gcc-4.2.2.orig/configure.in 2008-01-15 23:23:41.000000000 +0100
++++ gcc-4.2.2/configure.in 2008-01-15 23:24:36.000000000 +0100
+@@ -1066,14 +1066,14 @@
+ AC_ARG_WITH(mpfr_lib, [ --with-mpfr-lib=PATH Specify the directory for the installed MPFR library])
+
+ if test "x$with_mpfr" != x; then
+- gmplibs="-L$with_mpfr/lib $gmplibs"
++ gmplibs="-Wl,-rpath,$with_mpfr/lib -L$with_mpfr/lib $gmplibs"
+ gmpinc="-I$with_mpfr/include"
+ fi
+ if test "x$with_mpfr_include" != x; then
+ gmpinc="-I$with_mpfr_include"
+ fi
+ if test "x$with_mpfr_lib" != x; then
+- gmplibs="-L$with_mpfr_lib $gmplibs"
++ gmplibs="-Wl,-rpath,$with_mpfr_lib -L$with_mpfr_lib $gmplibs"
+ fi
+
+ # Specify a location for gmp
============================================================
--- packages/gcc/gcc-4.2.2/gcc-4.0.2-e300c2c3.patch 84568712feddebdf1d7bf5b760367393b94cf58d
+++ packages/gcc/gcc-4.2.2/gcc-4.0.2-e300c2c3.patch 84568712feddebdf1d7bf5b760367393b94cf58d
@@ -0,0 +1,311 @@
+Adds support for Freescale Power architecture e300c2 and e300c3 cores.
+http://www.bitshrine.org/gpp/tc-fsl-x86lnx-e300c3-nptl-4.0.2-2.src.rpm
+
+Leon Woestenberg <leonw at mailcan.com>
+
+Index: gcc-4.1.2/gcc/config/rs6000/e300c2c3.md
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.1.2/gcc/config/rs6000/e300c2c3.md 2007-10-18 15:32:51.000000000 +0200
+@@ -0,0 +1,189 @@
++;; Pipeline description for Motorola PowerPC e300c3 core.
++;; Copyright (C) 2003 Free Software Foundation, Inc.
++;;
++;; This file is part of GCC.
++
++;; GCC is free software; you can redistribute it and/or modify it
++;; under the terms of the GNU Genera%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rc794a426d2a55b0c4b5f1f6fee90c8272bd266e9 -rc32d254617ffcc037ac8e1b813c7d23979d2cb1c
#
#
#
# add_file "packages/gsm/files/stdint.patch"
# content [04cc8ef32d32ede1c69b0b07e61d2799a549ad51]
#
# add_file "packages/gsm/libgsmd-lips_svn.bb"
# content [9ce3eff62bdc12b8fdc3880b21d14c4ddca11602]
#
# patch "packages/gpephone/libmsgenabler2_svn.bb"
# from [54a29d568f999ecbd83b1ce249da584fbcec85f3]
# to [98732dfed57aec57dd1b60c208b0540f3fc15122]
#
# patch "packages/linux/linux-tornado-omap2/htctornado/defconfig"
# from [308cbe721749ba6fcf4f8b3909cc904bf3fad4d9]
# to [9b493e680180251433c7b19b9ab3e08f41158179]
#
# patch "packages/meta/meta-toolchain-gpe-sbox.bb"
# from [cfdfc9f4b2bbdd1f3ad0ebd0cfa69553220548d7]
# to [8c13ffb0df097aec092934180a6187818aba7378]
#
# patch "packages/meta/meta-toolchain-gpe.bb"
# from [e4b3b787a0714a603a46e6d0423cfddb7bba3c58]
# to [96ae935de25684f8ec51be678ff8a2aedf946d99]
#
# patch "packages/meta/meta-toolchain-openmoko.bb"
# from [052ed3fc28dde371bd81be6bf9ffaa47c10deb57]
# to [2c36f31834b317cfdc81cff2dc8cd7db05229bcf]
#
# patch "packages/meta/meta-toolchain-sbox.bb"
# from [00b9d0333251622f7df96dfb38a417c61e90a281]
# to [aa24669823d24a74c6fa299901b587d1432ba62a]
#
# patch "packages/meta/meta-toolchain.bb"
# from [3fe2673a61b591aed4f247f8201896a640d5ed35]
# to [b52d096ec913c333f9bb14b192bc922b80854834]
#
============================================================
--- packages/gsm/files/stdint.patch 04cc8ef32d32ede1c69b0b07e61d2799a549ad51
+++ packages/gsm/files/stdint.patch 04cc8ef32d32ede1c69b0b07e61d2799a549ad51
@@ -0,0 +1,17 @@
+--- include/libtapi/tel_bas_types.h~ 2008-01-16 12:48:19.000000000 +0100
++++ include/libtapi/tel_bas_types.h 2008-01-16 12:48:19.000000000 +0100
+@@ -27,13 +27,7 @@
+ /******************************************************************************
+ * Type definitions
+ *****************************************************************************/
+-#ifndef _STDINT_H
+-typedef unsigned long uint32_t;
+-typedef unsigned short uint16_t;
+-typedef unsigned char uint8_t;
+-/* typedef long int32_t; */
+-typedef unsigned int size_t;
+-#endif
++#include <stdint.h>
+
+
+ typedef unsigned long tel_bool_t;
============================================================
--- packages/gsm/libgsmd-lips_svn.bb 9ce3eff62bdc12b8fdc3880b21d14c4ddca11602
+++ packages/gsm/libgsmd-lips_svn.bb 9ce3eff62bdc12b8fdc3880b21d14c4ddca11602
@@ -0,0 +1,15 @@
+BASEPN = "gsmd-lips"
+CONFLICTNAME = "gsmd-devel gsmd"
+
+require gsmd.inc
+
+RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel libtapi libgsmd-dev"
+
+PV = "0.0+svnr${SRCREV}"
+PR = "r2"
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/;module=gsm \
+ file://stdint.patch;patch=1;pnum=0 \
+ file://gsmd \
+ file://default"
+
============================================================
--- packages/gpephone/libmsgenabler2_svn.bb 54a29d568f999ecbd83b1ce249da584fbcec85f3
+++ packages/gpephone/libmsgenabler2_svn.bb 98732dfed57aec57dd1b60c208b0540f3fc15122
@@ -1,10 +1,10 @@ PV = "0.0+svnr-${SRCREV}"
LICENSE = "LiPS"
DESCRIPTION = "LiPS message backend library."
SECTION = "gpe/libs"
PRIORITY = "optional"
DEPENDS = "glib-2.0 dbus-glib librecord2 liblipsevent2 telepathy-mission-control libgsmd-lips"
PV = "0.0+svnr-${SRCREV}"
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
@@ -14,7 +14,9 @@ S = ${WORKDIR}/${PN}
S = ${WORKDIR}/${PN}
-FILES_${PN} += "$(datadir)/libmsgenabler2"
+FILES_${PN} += "${datadir}/libmsgenabler2 ${libdir}/msg-providers/*.0"
+FILES_${PN}-dev += "${libdir}/msg-providers/*.so ${libdir}/msg-providers/*a"
+FILES_${PN}-dbg += "${libdir}/msg-providers/.debug"
do_stage () {
autotools_stage_all
============================================================
--- packages/linux/linux-tornado-omap2/htctornado/defconfig 308cbe721749ba6fcf4f8b3909cc904bf3fad4d9
+++ packages/linux/linux-tornado-omap2/htctornado/defconfig 9b493e680180251433c7b19b9ab3e08f41158179
@@ -259,7 +259,10 @@ CONFIG_IP_FIB_HASH=y
# CONFIG_IP_MULTICAST is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_PNP is not set
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
# CONFIG_ARPD is not set
============================================================
--- packages/meta/meta-toolchain-gpe-sbox.bb cfdfc9f4b2bbdd1f3ad0ebd0cfa69553220548d7
+++ packages/meta/meta-toolchain-gpe-sbox.bb 8c13ffb0df097aec092934180a6187818aba7378
@@ -9,3 +9,4 @@ require meta-toolchain.bb
require meta-toolchain.bb
+SDK_SUFFIX = "toolchain-gpe-sbox"
============================================================
--- packages/meta/meta-toolchain-gpe.bb e4b3b787a0714a603a46e6d0423cfddb7bba3c58
+++ packages/meta/meta-toolchain-gpe.bb 96ae935de25684f8ec51be678ff8a2aedf946d99
@@ -7,3 +7,4 @@ require meta-toolchain.bb
require meta-toolchain.bb
+SDK_SUFFIX = "toolchain-gpe"
============================================================
--- packages/meta/meta-toolchain-openmoko.bb 052ed3fc28dde371bd81be6bf9ffaa47c10deb57
+++ packages/meta/meta-toolchain-openmoko.bb 2c36f31834b317cfdc81cff2dc8cd7db05229bcf
@@ -1,4 +1,5 @@ require meta-toolchain.bb
TOOLCHAIN_TARGET_TASK = "task-toolchain-openmoko-sdk"
require meta-toolchain.bb
+SDK_SUFFIX = "toolchain-openmoko"
============================================================
--- packages/meta/meta-toolchain-sbox.bb 00b9d0333251622f7df96dfb38a417c61e90a281
+++ packages/meta/meta-toolchain-sbox.bb aa24669823d24a74c6fa299901b587d1432ba62a
@@ -1,6 +1,8 @@ require meta-toolchain.bb
TOOLCHAIN_TARGET_TASK = "\
task-sdk-bare \
task-sdk-sbox"
require meta-toolchain.bb
+SDK_SUFFIX = "toolchain-sbox"
+
============================================================
--- packages/meta/meta-toolchain.bb 3fe2673a61b591aed4f247f8201896a640d5ed35
+++ packages/meta/meta-toolchain.bb b52d096ec913c333f9bb14b192bc922b80854834
@@ -1,12 +1,14 @@ DEPENDS = "ipkg-native ipkg-utils-native
DESCRIPTION = "Meta package for building a installable toolchain"
LICENSE = "MIT"
DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
+PR = "r1"
inherit sdk meta
SDK_DIR = "${WORKDIR}/sdk"
SDK_OUTPUT = "${SDK_DIR}/image"
SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
+SDK_SUFFIX = "toolchain"
FEED_ARCH ?= "${TARGET_ARCH}"
@@ -120,7 +122,7 @@ do_populate_sdk() {
# package it up
mkdir -p ${SDK_DEPLOY}
cd ${SDK_OUTPUT}
- fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}-toolchain.tar.bz2 .
+ fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}-${SDK_SUFFIX}.tar.bz2 .
}
do_populate_sdk[nostamp] = "1"
More information about the Openembedded-commits
mailing list