[oe-commits] org.oe.dev merge of 'a8fc829ccd7c5a7c71d76bac5c9f37e82d0b2ab5'
rpurdie commit
openembedded-commits at lists.openembedded.org
Sat Sep 1 19:08:31 UTC 2007
merge of 'a8fc829ccd7c5a7c71d76bac5c9f37e82d0b2ab5'
and 'ed77cd74b64e0454761e99d7c3b09c39ef2a97a9'
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: fc0f69d8b34d96321d6db9e81c56b761544f2721
ViewMTN: http://monotone.openembedded.org/revision.psp?id=fc0f69d8b34d96321d6db9e81c56b761544f2721
Files:
1
packages/uboot/uboot-openmoko_1.2.0+git8993e54b6f397973794f3d6f47d3b3c0c98dd4f6+svn20070819.bb
conf/distro/include/sane-srcdates.inc
packages/uboot/uboot-openmoko_svn.bb
packages/binutils/binutils-cross-sdk_2.17.50.0.5.bb
packages/binutils/binutils-cross-sdk_2.17.50.0.12.bb
packages/gdb/files/sim-install-6.6.patch
packages/gdb/gdb-common.inc
packages/gdb/gdb-cross-sdk_6.6.bb
classes/base.bbclass
classes/image.bbclass
classes/multimachine.bbclass
classes/native.bbclass
classes/package.bbclass
classes/package_ipk.bbclass
classes/package_tar.bbclass
classes/rootfs_deb.bbclass
classes/rootfs_ipk.bbclass
classes/sdk.bbclass
conf/bitbake.conf
packages/angstrom/angstrom-bootmanager-image.bb
packages/angstrom/angstrom-console-image.bb
packages/angstrom/angstrom-gateway-image.bb
packages/angstrom/angstrom-mokogateway-image.bb
packages/angstrom/angstrom-x11-gpe-image.bb
packages/angstrom/angstrom-x11-image.bb
packages/angstrom/angstrom-x11-office-image.bb
packages/angstrom/angstrom-x11-pimlico-image.bb
packages/gcc/gcc-cross-sdk_3.4.4.bb
packages/gcc/gcc-cross-sdk_4.1.0.bb
packages/gcc/gcc-cross-sdk_4.1.1.bb
packages/gcc/gcc-cross-sdk_4.1.2.bb
packages/gcc/gcc-package-sdk.inc
packages/gcc/gcc4-build-sdk.inc
packages/gdb/gdb-cross.inc
packages/gdb/gdb-cross_6.3.bb
packages/gdb/gdb-cross_6.4.bb
packages/gdb/gdb-cross_6.6.bb
packages/gdb/gdb.inc
packages/gdb/gdb_6.3.bb
packages/gdb/gdb_6.4.bb
packages/gdb/gdb_6.6.bb
packages/images/angstrom-minimal-image.bb
packages/images/bootstrap-image-bootchart.bb
packages/images/bootstrap-image.bb
packages/images/devimage-image.bb
packages/images/dvb-image.bb
packages/images/e-image-core.bb
packages/images/e-image.bb
packages/images/essential-image.bb
packages/images/essential-machine-image.bb
packages/images/gpe-image-blank-user.bb
packages/images/gpe-image.bb
packages/images/gpephone-image-vm.bb
packages/images/gpephone-image.bb
packages/images/helloworld-image.bb
packages/images/initramfs-image.bb
packages/images/initramfs-minimal-image.bb
packages/images/jlime-opie.bb
packages/images/maemo-image.bb
packages/images/mythfront-image.bb
packages/images/nslu2-linksys-image.bb
packages/images/nylon-image-base.bb
packages/images/nylon-image-extended.bb
packages/images/nylon-image-extra.bb
packages/images/nylon-image-mini.bb
packages/images/nylon-image-standard.bb
packages/images/openmoko-devel-image.bb
packages/images/openmoko-image.bb
packages/images/openmoko-sdk-image.bb
packages/images/openprotium-image.bb
packages/images/opie-image-16mb.bb
packages/images/opie-image.bb
packages/images/opie-kdepim-image.bb
packages/images/ossie-image.bb
packages/images/pivotboot-image.bb
packages/images/sdl-image.bb
packages/images/sectest-gpe-image.bb
packages/images/slugos-image.bb
packages/images/twin-image.bb
packages/images/uml-image.bb
packages/images/unslung-image.bb
packages/images/xfce-image.bb
packages/images/xterminal-image.bb
packages/jards/jards_1.0.bb
packages/nonworking/angstrom/angstrom-e-image.bb
Diffs:
#
# mt diff -ra8fc829ccd7c5a7c71d76bac5c9f37e82d0b2ab5 -rfc0f69d8b34d96321d6db9e81c56b761544f2721
#
#
#
# add_file "packages/uboot/uboot-openmoko_1.2.0+git8993e54b6f397973794f3d6f47d3b3c0c98dd4f6+svn20070819.bb"
# content [8d08d096caa72a97ccb48b2ac60bbc7435d1669a]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [e4bd3f42d9a1de5c4fc0909537055d3a32361afb]
# to [edc976173fe3b3eaefcad6ce35aff6594210bf8c]
#
# patch "packages/uboot/uboot-openmoko_svn.bb"
# from [2cd3fc93ef41e691d0a4a62f2416c9ea4c137a9d]
# to [e2be2c8abbfa2f529e0ca0879acb4195c4db28ac]
#
============================================================
--- packages/uboot/uboot-openmoko_1.2.0+git8993e54b6f397973794f3d6f47d3b3c0c98dd4f6+svn20070819.bb 8d08d096caa72a97ccb48b2ac60bbc7435d1669a
+++ packages/uboot/uboot-openmoko_1.2.0+git8993e54b6f397973794f3d6f47d3b3c0c98dd4f6+svn20070819.bb 8d08d096caa72a97ccb48b2ac60bbc7435d1669a
@@ -0,0 +1,92 @@
+DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) support"
+AUTHOR = "Harald Welte <laforge at openmoko.org>"
+LICENSE = "GPL"
+SECTION = "bootloader"
+PRIORITY = "optional"
+
+UBOOT_UPSTREAM_REV = "8993e54b6f397973794f3d6f47d3b3c0c98dd4f6"
+UBOOT_OPENMOKO_DATE = "20070819"
+UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4"
+
+PV = "1.2.0+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_DATE}"
+PR = "r2"
+
+PROVIDES = "virtual/bootloader"
+S = "${WORKDIR}/git"
+
+SRC_URI = "\
+ git://www.denx.de/git/u-boot.git/;protocol=git;tag=${UBOOT_UPSTREAM_REV} \
+ svn://svn.openmoko.org/branches/u-boot/pre-20070822;module=patches;date=${UBOOT_OPENMOKO_DATE};proto=http \
+ file://uboot-eabi-fix-HACK.patch \
+ file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
+"
+
+EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
+TARGET_LDFLAGS = ""
+
+do_quilt() {
+ mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
+ rm -Rf patches .pc
+}
+
+do_svnrev() {
+ FILE=${S}/tools/setlocalversion
+ OLDFILE=$FILE.old
+ NEWFILE=$FILE.new
+ cp $FILE $OLDFILE
+ LINES=`cat $OLDFILE | wc -l`
+ LINES_WE_WANT=$(($LINES-1))
+ LASTLINE=`cat $OLDFILE | tail -n 1`
+ cat $OLDFILE | head -n $LINES_WE_WANT > $NEWFILE
+ echo ${LASTLINE}_${PR} >> $NEWFILE
+ rm $FILE && mv $NEWFILE $FILE
+}
+
+do_configure_prepend() {
+ find . -name "*.mk" -exec sed -i 's,-mabi=apcs-gnu,,' {} \;
+ find . -name "Makefile" -exec sed -i 's,-mabi=apcs-gnu,,' {} \;
+ cat ${WORKDIR}/uboot-eabi-fix-HACK.patch |patch -p1
+}
+
+do_compile () {
+ chmod +x board/neo1973/gta*/split_by_variant.sh
+ for mach in ${UBOOT_MACHINES}
+ do
+ oe_runmake ${mach}_config
+ oe_runmake clean
+ find board -name lowlevel_foo.bin -exec rm '{}' \;
+ oe_runmake all
+ oe_runmake u-boot.udfu
+ if [ -f u-boot.udfu ]; then
+ mv u-boot.udfu u-boot_${mach}.bin
+ else
+ mv u-boot.bin u-boot_${mach}.bin
+ fi
+ if [ -f board/${mach}/lowlevel_foo.bin ]; then
+ mv board/${mach}/lowlevel_foo.bin \
+ lowlevel_foo_${mach}.bin
+ else
+ find board -name lowlevel_foo.bin \
+ -exec mv '{}' lowlevel_foo_${mach}.bin \;
+ fi
+ done
+}
+
+do_deploy () {
+ install -d ${DEPLOY_DIR_IMAGE}
+ 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
+}
+
+do_deploy[dirs] = "${S}"
+addtask deploy before do_package after do_install
+addtask quilt before do_patch after do_unpack
+addtask svnrev before do_patch after do_quilt
============================================================
--- conf/distro/include/sane-srcdates.inc e4bd3f42d9a1de5c4fc0909537055d3a32361afb
+++ conf/distro/include/sane-srcdates.inc edc976173fe3b3eaefcad6ce35aff6594210bf8c
@@ -40,9 +40,6 @@ SRCDATE_zaurusd ?= "20060628"
SRCDATE_web ?= "20060613"
SRCDATE_zaurusd ?= "20060628"
-# OpenMoko
-SRCDATE_uboot-openmoko = "20070829"
-
# GPE
SRCDATE_dasher-gpe ?= "20060814"
SRCDATE_rosetta ?= "20060804"
============================================================
--- packages/uboot/uboot-openmoko_svn.bb 2cd3fc93ef41e691d0a4a62f2416c9ea4c137a9d
+++ packages/uboot/uboot-openmoko_svn.bb e2be2c8abbfa2f529e0ca0879acb4195c4db28ac
@@ -1,25 +1,26 @@ PRIORITY = "optional"
DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) support"
AUTHOR = "Harald Welte <laforge at openmoko.org>"
LICENSE = "GPL"
SECTION = "bootloader"
PRIORITY = "optional"
+PROVIDES = "virtual/bootloader"
+PV = "1.2.0+git${SRCDATE}+svn${SRCDATE}"
+PR = "r0"
-UBOOT_UPSTREAM_REV = "3e66c078003607a7d1d214c15a5f262bc1b4032f"
-PV = "1.2.0+git${UBOOT_UPSTREAM_REV}+svn${SRCDATE}"
-PR = "r2"
+UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 smdk2440 hxd8 qt2410 gta02v1 gta02v2"
-PROVIDES = "virtual/bootloader"
-S = "${WORKDIR}/git"
+DEFAULT_PREFERENCE = "-1"
-SRC_URI = "git://www.denx.de/git/u-boot.git/;protocol=git;tag=${UBOOT_UPSTREAM_REV} \
- svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http \
- file://uboot-eabi-fix-HACK.patch \
- file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
+SRC_URI = "\
+ git://www.denx.de/git/u-boot.git/;protocol=git \
+ svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http \
+ file://uboot-eabi-fix-HACK.patch \
+ file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
"
+S = "${WORKDIR}/git"
EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
TARGET_LDFLAGS = ""
-UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 smdk2440 hxd8 qt2410 gta02v1 gta02v2"
do_quilt() {
mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
#
# mt diff -red77cd74b64e0454761e99d7c3b09c39ef2a97a9 -rfc0f69d8b34d96321d6db9e81c56b761544f2721
#
#
#
# rename "packages/binutils/binutils-cross-sdk_2.17.50.0.5.bb"
# to "packages/binutils/binutils-cross-sdk_2.17.50.0.12.bb"
#
# add_file "packages/gdb/files/sim-install-6.6.patch"
# content [b95eed64acf126110d587efd195eac887f3bdab4]
#
# add_file "packages/gdb/gdb-common.inc"
# content [76e7a3fc4ba6397fcda292796453f59d35ede92f]
#
# add_file "packages/gdb/gdb-cross-sdk_6.6.bb"
# content [9444a910f04467593c5c669381d5ed60212c8324]
#
# patch "classes/base.bbclass"
# from [0b7bd90cd81cad21be3a5562472533d725e69760]
# to [372ea5a35ab3fd0e2d7d37ea1bb72d4d9e69a041]
#
# patch "classes/image.bbclass"
# from [9ce7e97fa49142c8e94930461f94af3ec3c18110]
# to [95a9259837f0da14059da200343397588b5b677f]
#
# patch "classes/multimachine.bbclass"
# from [c75808c11d01fe1057e53269f8da5b6ce04dc1aa]
# to [a237dbcaf9325ca862cbf52d3bb70f3314591e1d]
#
# patch "classes/native.bbclass"
# from [9790e613a5cd8ec531d788c5dd2d9642523821ca]
# to [4402d1860cf1901a5e621873b6807574df9906e4]
#
# patch "classes/package.bbclass"
# from [a4793b3e861b8e79ae72fd8fb897b01aff983b38]
# to [8214219f4cf766c4e5f3298b107e9215fe944e47]
#
# patch "classes/package_ipk.bbclass"
# from [115710babe1d2cc095e515f58f4593c548e5b72b]
# to [54b39e5efba77c456870382c897602c36e8d5cfc]
#
# patch "classes/package_tar.bbclass"
# from [fcd7bc894001e323cb9cf5f5d1f547447e7b636e]
# to [10aa1d1ddc7ffe939e5af5cd9118f366d4d4aba3]
#
# patch "classes/rootfs_deb.bbclass"
# from [707eb78db91916253acef44e2f1a8ff049193cff]
# to [fb9e28d3e3b80de398d3568baccc39312196f8da]
#
# patch "classes/rootfs_ipk.bbclass"
# from [237808776045be08b7c6b05f62ed82bb94daada8]
# to [1253e5e3c31d91f0a10bebee62020c47fbf32139]
#
# patch "classes/sdk.bbclass"
# from [100957b869cd48dd7933ace807f396c946442a32]
# to [201b96c39256c1a1221fd02c95ff7cf5b14ee685]
#
# patch "conf/bitbake.conf"
# from [52316e1f1fa41334c7f484d03268cc7c2ae75f0f]
# to [391e9060470ab898403e7bd7b2526cab82544e29]
#
# patch "packages/angstrom/angstrom-bootmanager-image.bb"
# from [d1a3baa7d2572efe426c8a091cdec5017f742fc0]
# to [2e84f2e4e13e55c8f699a445bf9dc205ed33e965]
#
# patch "packages/angstrom/angstrom-console-image.bb"
# from [e642f25712e1191f9671d162c09fd492a85400bc]
# to [935450894690e109439d4565572d813671a85699]
#
# patch "packages/angstrom/angstrom-gateway-image.bb"
# from [0d28af15cf07cfbde7e6a5b3c5f6c40800846eff]
# to [ce18fb7ee4122aa54cc0eec2623dc2fc0deda017]
#
# patch "packages/angstrom/angstrom-mokogateway-image.bb"
# from [392588d433be0b9582d92f0f4db2cf01a9e967f3]
# to [d79e0a3bee7183b521cdf2a2f55bf638a3b55be8]
#
# patch "packages/angstrom/angstrom-x11-gpe-image.bb"
# from [ef05cb17a109e1bfa5527107b64ac54ac48d3b59]
# to [c8543db52c9f3b3793372a91e5c2d807fe31ca3b]
#
# patch "packages/angstrom/angstrom-x11-image.bb"
# from [72ac30a3a1a9a6405bfbb3ec0914d706d5e61d82]
# to [340f91d6bae38bceb8a159ca15f7d303d7188b3e]
#
# patch "packages/angstrom/angstrom-x11-office-image.bb"
# from [c3ed81e0ddbf8343fd79debe9634750f56e9c89d]
# to [396fb20d63dee90a6a41f8ed68f8fc1580bdd778]
#
# patch "packages/angstrom/angstrom-x11-pimlico-image.bb"
# from [591a09b2439c2a10852348e51cc711372a903144]
# to [42401d25b63f709c0357a47f1c22ab27004ab097]
#
# patch "packages/binutils/binutils-cross-sdk_2.17.50.0.12.bb"
# from [850b12e403cf660ad7fffe0e38bb611ccb2cd345]
# to [9276912dab9aa784046d22334d366a5bb9ff6f0b]
#
# patch "packages/gcc/gcc-cross-sdk_3.4.4.bb"
# from [fa5ca4ad0eaf2ec0fa465b06f463bee485c52b64]
# to [ffaafb6a6ef931a5cd71c7623aba38189dc94161]
#
# patch "packages/gcc/gcc-cross-sdk_4.1.0.bb"
# from [7eb85e54952c596416152f1e969d0bd613f44447]
# to [2cea3da097f8c9f838e82a3e085426ce0916af21]
#
# patch "packages/gcc/gcc-cross-sdk_4.1.1.bb"
# from [02ea95e063fa7ba063dc7824231550515b11b651]
# to [6837a925b54454ab71c724293d0af79096445b3a]
#
# patch "packages/gcc/gcc-cross-sdk_4.1.2.bb"
# from [1eec9c99dd94a9914c2db2ccb6a1be346b5c492c]
# to [a1f2534a402624014080a47493957b86dbad29eb]
#
# patch "packages/gcc/gcc-package-sdk.inc"
# from [65fed51db7cc5fb466ea0e3379ec3b2f89b84e53]
# to [371ce0d18607bf95321025378912c51a2bd28f12]
#
# patch "packages/gcc/gcc4-build-sdk.inc"
# from [9346ade760bf1914b9aef9ef6701465c2001aef9]
# to [803d124f9bdd702633e7820806cfc41d7703ddc8]
#
# patch "packages/gdb/gdb-cross.inc"
# from [6f5809f545f7fdf8a8370668aa2b80ff1326b90f]
# to [f22b5bdf741d9b9ce7a69086a1b6ff8dc8383420]
#
# patch "packages/gdb/gdb-cross_6.3.bb"
# from [be7d573a1528df0a31aa170fb58bfc8e429ad764]
# to [67c508c6f857c47fabebea93670057651603d417]
#
# patch "packages/gdb/gdb-cross_6.4.bb"
# from [c88f5d416e58b0c47f562e9240d553eb3b2db608]
# to [0a16a7c05d19a6ebfe36f11f9bc18b6d6aeba956]
#
# patch "packages/gdb/gdb-cross_6.6.bb"
# from [444bbbdac07898a36f9b2485a1f0f75acc257a6f]
# to [9a7805347f8169f59da65f6cb95a2535ac4be50a]
#
# patch "packages/gdb/gdb.inc"
# from [55f35f97931281a8dfc20d2a69f6fc1666e2496d]
# to [d38ac31ee4064d23295f055b62386aedf580e1f7]
#
# patch "packages/gdb/gdb_6.3.bb"
# from [c928ce845b63093df25ca66e243e3bf15c7d5f99]
# to [adec94e411af2e5c3f8afd912c47bd0164f8d3b8]
#
# patch "packages/gdb/gdb_6.4.bb"
# from [7998a8516e9b05b361fb0215ece78774f48e62e0]
# to [111b16b625d24b592474e35960c46a954fa102ed]
#
# patch "packages/gdb/gdb_6.6.bb"
# from [8ee31828436ac1d886ad16b308b24da25b75e05e]
# to [adec94e411af2e5c3f8afd912c47bd0164f8d3b8]
#
# patch "packages/images/angstrom-minimal-image.bb"
# from [18997ce3f1ed2ef3216d3518a98aade1078e00de]
# to [c74056146aaed6f3e2cd64879f504ea6920efb59]
#
# patch "packages/images/bootstrap-image-bootchart.bb"
# from [d396931ba5b08f8e0867a0ebc0d369e2d306d9f6]
# to [f2bbfe865bcebcf4fb84a48dc5a0fa6d2c1cbc1a]
#
# patch "packages/images/bootstrap-image.bb"
# from [9ecc0265b971454b5482330c5130c5201492b190]
# to [15117201e2baccd59639cbc33f28a0fc4c280d5a]
#
# patch "packages/images/devimage-image.bb"
# from [c36b2b99ac445dcaf5b0c56269ba22ed9f01f062]
# to [0ad21673974579715377822a74cb6ea99dc0b14a]
#
# patch "packages/images/dvb-image.bb"
# from [16734b11053e9265e2bbc29b4b490ac5fd4a9e6c]
# to [feda66d8e6142b4c4cd2c4d19d67abdfb15d46b3]
#
# patch "packages/images/e-image-core.bb"
# from [659a155c0c58b510434bacd02e80b3de3e41de7b]
# to [2f89f94c9e5bb901017ea12bb634dab6cfdb11c5]
#
# patch "packages/images/e-image.bb"
# from [335b0fd609b4b88b8939987c8e319d1b19d6c062]
# to [6a88d88a9acff0a0c48e3f19d949722c985aa5be]
#
# patch "packages/images/essential-image.bb"
# from [b2d46113d5527027937bbf018e3362c2878579ce]
# to [8c7a5a0e09773a8a7a1c89831407b317bbbc11a3]
#
# patch "packages/images/essential-machine-image.bb"
# from [4dfd3d136a46a77b325d6d9d36a483890ec54ab1]
# to [d48d0500f115db2f4fea77f51eea4460fbeb0a36]
#
# patch "packages/images/gpe-image-blank-user.bb"
# from [def660611d195743449911603d19d0319cbc7fa8]
# to [f6f543d1909dcf24b5c53357ba31ba8e8c9525b3]
#
# patch "packages/images/gpe-image.bb"
# from [4cb5b4abe319688775fba3e25151dc345ce518a8]
# to [f2c76eb0405a24116e75d07e0c6602fb6ad24fd9]
#
# patch "packages/images/gpephone-image-vm.bb"
# from [75f6562087c006a96cb057109a664f4001f8eca7]
# to [0167c4dcc98b7eb9cfcc88c6f5d9c13fc339b30e]
#
# patch "packages/images/gpephone-image.bb"
# from [8855d0036a5e84a843aafd5b38afd35843e4d76e]
# to [9533ae73f73f2cef3a057b581e2fdeb0fed85426]
#
# patch "packages/images/helloworld-image.bb"
# from [62d0dfb6cdd494db5b4731b74f5f3a4a92f0a119]
# to [b83c6b949ae1bc6d30732697e16978ec96e207f8]
#
# patch "packages/images/initramfs-image.bb"
# from [58e79ba3a3834ad8830c0866be9d5e351880e916]
# to [16330772de554a7ddfd102c78519476ac56c84bd]
#
# patch "packages/images/initramfs-minimal-image.bb"
# from [93795104d3a49aec178fec7662a11a453edacee9]
# to [06a49c2ea305fe2ab0ea3fd38e08c81dcd675500]
#
# patch "packages/images/jlime-opie.bb"
# from [fb0ae30a11e9940340804481a49965ce955f27c8]
# to [5adb8e09ea07ccb582513379a3272fe6813c04c4]
#
# patch "packages/images/maemo-image.bb"
# from [38b7c055e0d748a31f8fe2a0dbee151a01015197]
# to [a9624c71e754ab36fbe47b3b0b6a1bd719117d05]
#
# patch "packages/images/mythfront-image.bb"
# from [857dbcbe31f405dc5dbf8868591fe8fb13f097b0]
# to [48bc732d8384950f3cb2939b909cba16e0a72c74]
#
# patch "packages/images/nslu2-linksys-image.bb"
# from [c36ef190014a7d7ea8066f036c2a6bbc81c52f12]
# to [dd5a92d8f5edc12b7c7bb99d7c121921c46f8d40]
#
# patch "packages/images/nylon-image-base.bb"
# from [e62cc38191137aa875eb2190497d2eef7d718afb]
# to [72121001960a9d439e4b356daf2fffa7b6732fb2]
#
# patch "packages/images/nylon-image-extended.bb"
# from [0390e05099b2ae84d6027fed8d7375e6f766d57a]
# to [091a9c2aa97c837f18dfa9ebf9d7effeebbb175a]
#
# patch "packages/images/nylon-image-extra.bb"
# from [838bc55bcd2b847574d459b88d9b8fd8f8b38cfa]
# to [75bd98b145feca2a61342a917deb1920bb2fb91c]
#
# patch "packages/images/nylon-image-mini.bb"
# from [fa47a8388a5cdf939a7afd5a103890b2aee7dc14]
# to [0335ce21055c0a6589a1af2c0eb682c2da39a1e5]
#
# patch "packages/images/nylon-image-standard.bb"
# from [0540e4923fa63013c7896a663072e93840f0eeaf]
# to [a5880b59318a1fa133cf0ca74233d0e575e37179]
#
# patch "packages/images/openmoko-devel-image.bb"
# from [bb656d3436f7ee0e279febc18b64f72d1a329c5d]
# to [bc0401d66feb544f13b6c63e6ce1c48a11ad73ba]
#
# patch "packages/images/openmoko-image.bb"
# from [97b5722f7eef6ce6117016cc573067e30da5f2ee]
# to [27d8c08338a94022bf82abaf47e4cb3564893958]
#
# patch "packages/images/openmoko-sdk-image.bb"
# from [76a888c6303ad27c5ddc0893430df0492e4a375e]
# to [9f8e0d1ff8b5ec36535b0122bafd1efe0563a5f0]
#
# patch "packages/images/openprotium-image.bb"
# from [b8fcbe3a228e05dae5d6343193ed4e38dbaf367d]
# to [738026dd8e8a9e3fe4c7be21ad6fad4da91da8a3]
#
# patch "packages/images/opie-image-16mb.bb"
# from [3961c821470050fd70488a1688a142f074ae5a4a]
# to [3a0a66249e372569c26b37c7367ab42831e5d656]
#
# patch "packages/images/opie-image.bb"
# from [6e82664c5e048a6ace172b1590aec6a3be929657]
# to [eab510fa58a1cbe34c8c15ea7cacb18bf5bd9d92]
#
# patch "packages/images/opie-kdepim-image.bb"
# from [8696dabcc257470994a6098f36e85d94398fda7f]
# to [b3f89f0bf576b3087519b8bf0575f0c778f566db]
#
# patch "packages/images/ossie-image.bb"
# from [b95d3bed33d2e1c5b580842fb3dd52456a12ff10]
# to [d5dca67a2650abe5091a8b2c081276ade998dbf9]
#
# patch "packages/images/pivotboot-image.bb"
# from [61ceb02faed3ae93dcb1a48b9aa73db239469374]
# to [931d01aceb55db75f92ae51399ef1b8f93cceac0]
#
# patch "packages/images/sdl-image.bb"
# from [cb3d6b0a957444e5eefe63c10a0d0b69f5809aef]
# to [448ead56dfe59a356dcfaf77c82ebbea11a48c6b]
#
# patch "packages/images/sectest-gpe-image.bb"
# from [1c5026331d2a81d6fe7ec10af95879d45e4b36e6]
# to [ccab1840c4f2c5467193df5f70ecf3452bdbb7b6]
#
# patch "packages/images/slugos-image.bb"
# from [950005936dcfec1fac4a45eb6a5e74226ac2d3da]
# to [5fa0b69b4da806b2db1bcf584aac9b8668a1dc94]
#
# patch "packages/images/twin-image.bb"
# from [d1caa569fe0e916bb5abf973b4c4aa2d27f30b82]
# to [e61b77cfaae4f71f1664fcb8803495f940d1cdfe]
#
# patch "packages/images/uml-image.bb"
# from [8ae454a01f633c2b15ab5aa755c67833fbb683c0]
# to [391e74714e87b8beb2a540b6ed0430fcfb1ba214]
#
# patch "packages/images/unslung-image.bb"
# from [c3dafe53a4d27e373db9edc06a36d4ee74867f33]
# to [c72989e4cd7c8c0eefabc8565d48d7662ce01c37]
#
# patch "packages/images/xfce-image.bb"
# from [34c5542022b798ed05fb9ee9b4110c9dac68897c]
# to [3962da7aedbaf23a7114e99496fac8550b5834dc]
#
# patch "packages/images/xterminal-image.bb"
# from [9d5a82244519310685a1f59dc69dae7fc6806f42]
# to [9778de55055ea44a2f2d22f8f7d70aae7b76fdd1]
#
# patch "packages/jards/jards_1.0.bb"
# from [2a8f131485b3f33ccff12abdd2866a28ad19d279]
# to [41882fb49c5df7133c2b1731c1aceacf76656a64]
#
# patch "packages/nonworking/angstrom/angstrom-e-image.bb"
# from [f173fa7b8ce59082d4399b1ea1f88269b4befca7]
# to [86281d61f887f49d628dc5f2bfc7d62e34345a27]
#
============================================================
--- packages/gdb/files/sim-install-6.6.patch b95eed64acf126110d587efd195eac887f3bdab4
+++ packages/gdb/files/sim-install-6.6.patch b95eed64acf126110d587efd195eac887f3bdab4
@@ -0,0 +1,12 @@
+--- gdb-6.1/sim/common/Makefile.in~ 2004-01-15 21:25:06.000000000 +0000
++++ gdb-6.1/sim/common/Makefile.in 2004-07-22 17:07:46.237809032 +0100
+@@ -34,7 +34,7 @@
+
+ datadir = @datadir@
+ mandir = @mandir@
+-man1dir = $(mandir)/man1
++man1dir = $(DESTDIR)$(mandir)/man1
+ infodir = @infodir@
+ includedir = @includedir@
+
+
============================================================
--- packages/gdb/gdb-common.inc 76e7a3fc4ba6397fcda292796453f59d35ede92f
+++ packages/gdb/gdb-common.inc 76e7a3fc4ba6397fcda292796453f59d35ede92f
@@ -0,0 +1,22 @@
+DESCRIPTION = "gdb - GNU debugger"
+HOMEPAGE = "http://www.gnu.org/software/gdb/"
+LICENSE="GPL"
+SECTION = "devel"
+PRIORITY = "optional"
+
+inherit autotools
+
+SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gdb-${PV}"
+
+export CC_FOR_BUILD = "${BUILD_CC}"
+export CXX_FOR_BUILD = "${BUILD_CXX}"
+export CPP_FOR_BUILD = "${BUILD_CPP}"
+export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
+export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}"
+export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}"
+
+S = "${WORKDIR}/gdb-${PV}"
+B = "${WORKDIR}/build-${TARGET_SYS}"
+
============================================================
--- packages/gdb/gdb-cross-sdk_6.6.bb 9444a910f04467593c5c669381d5ed60212c8324
+++ packages/gdb/gdb-cross-sdk_6.6.bb 9444a910f04467593c5c669381d5ed60212c8324
@@ -0,0 +1,7 @@
+require gdb-cross.inc
+
+inherit sdk
+
+do_stage() {
+ :
+}
============================================================
--- classes/base.bbclass 0b7bd90cd81cad21be3a5562472533d725e69760
+++ classes/base.bbclass 372ea5a35ab3fd0e2d7d37ea1bb72d4d9e69a041
@@ -482,8 +482,11 @@ python base_do_fetch() {
(type,host,path,_,_,_) = bb.decodeurl(url)
uri = "%s://%s%s" % (type,host,path)
try:
- if not base_chk_file(parser, pn, pv,uri, localpath, d):
- bb.note("%s-%s-%s has no section, not checking URI" % (pn,pv,uri))
+ if not base_chk_file(parser, pn, pv,uri, localpath, d):
+ if type != "file":
+ bb.note("%s-%s-%s has no section, not checking URI" % (pn,pv,uri))
+ else:
+ bb.debug("%s-%s-%s has no section, not checking URI" % (pn,pv,uri))
except Exception:
raise bb.build.FuncFailed("Checksum of '%s' failed" % uri)
}
@@ -681,7 +684,8 @@ do_populate_staging[dirs] = "${STAGING_D
${STAGING_DATADIR} \
${S} ${B}"
-addtask populate_staging after do_package_write
+# Could be compile but populate_staging and do_install shouldn't run at the same time
+addtask populate_staging after do_install
python do_populate_staging () {
bb.build.exec_func('do_stage', d)
@@ -724,7 +728,7 @@ def packaged(pkg, d):
def packaged(pkg, d):
import os, bb
- return os.access(bb.data.expand('${STAGING_DIR}/pkgdata/runtime/%s.packaged' % pkg, d), os.R_OK)
+ return os.access(bb.data.expand('${PKGDATA_DIR}/runtime/%s.packaged' % pkg, d), os.R_OK)
def read_pkgdatafile(fn):
pkgdata = {}
@@ -750,23 +754,23 @@ def has_subpkgdata(pkg, d):
def has_subpkgdata(pkg, d):
import bb, os
- fn = bb.data.expand('${STAGING_DIR}/pkgdata/runtime/%s' % pkg, d)
+ fn = bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d)
return os.access(fn, os.R_OK)
def read_subpkgdata(pkg, d):
import bb, os
- fn = bb.data.expand('${STAGING_DIR}/pkgdata/runtime/%s' % pkg, d)
+ fn = bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d)
return read_pkgdatafile(fn)
def has_pkgdata(pn, d):
import bb, os
- fn = bb.data.expand('${STAGING_DIR}/pkgdata/%s' % pn, d)
+ fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d)
return os.access(fn, os.R_OK)
def read_pkgdata(pn, d):
import bb, os
- fn = bb.data.expand('${STAGING_DIR}/pkgdata/%s' % pn, d)
+ fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d)
return read_pkgdatafile(fn)
python read_subpackage_metadata () {
@@ -847,7 +851,6 @@ def base_after_parse(d):
paths = []
for p in [ "${PF}", "${P}", "${PN}", "files", "" ]:
- paths.append(bb.data.expand(os.path.join("${FILE_DIRNAME}", p, "${MACHINE}"), d))
path = bb.data.expand(os.pa%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list