[oe-commits] org.oe.dev merge of '49fb48a813e1e0d599f74dd7a809922ab71939b1'
mickeyl commit
openembedded-commits at lists.openembedded.org
Mon Dec 3 20:05:27 UTC 2007
merge of '49fb48a813e1e0d599f74dd7a809922ab71939b1'
and '6fe2cd0b60b675a1e3118d25934adb4693f3b8ed'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 3fe444996883cc54a95f94bd89d9fba641d08c20
ViewMTN: http://monotone.openembedded.org/revision/info/3fe444996883cc54a95f94bd89d9fba641d08c20
Files:
1
packages/psplash/files/angstrom/angstrom-psplash-qvga-img.h
packages/psplash/files/angstrom/angstrom-psplash-vga-img.h
packages/dropbear/dropbear-early
packages/update-rc.d/files
packages/xkbd/xkbd-layout-ru
contrib/angstrom/angstrom.png
packages/directfb/files/fix-configure-include-path.patch
packages/dropbear/dropbear-early/dropbear-early
packages/dropbear/dropbear-early_1.0.bb
packages/gtk-webcore/midori_0.0.12.bb
packages/images/initramfs-bootmenu-image.bb
packages/ipkg/files/ipkg-configure
packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb
packages/meta/external-toolchain.bb
packages/psplash/files/logo-math.patch
packages/sofia-sip/sofia-sip_1.12.7.bb
packages/update-rc.d/files/add-verbose.patch
packages/xkbd/xkbd-0.8.15/differentiate-desktop-name.patch
packages/xkbd/xkbd-layout-ru/en-ru-123.xkbd
packages/xorg-lib/libx11-native_1.0.3.bb
packages/xorg-xserver/xserver-kdrive/00-xglamo-logs.patch
packages/xorg-xserver/xserver-kdrive/01-xglamo-scrolling-artifact-fix.patch
packages/xorg-xserver/xserver-kdrive/02-xglamo-no-dri.patch
packages/xorg-xserver/xserver-kdrive/03-xglamo-no-vesa.patch
classes/nslu2-image.bbclass
conf/distro/angstrom-2007.1.conf
conf/machine/include/ixp4xx.inc
conf/machine/mpc8313e-rdb.conf
contrib/angstrom/angstrom.svg
packages/angstrom/angstrom-gpe-task-base.bb
packages/angstrom/angstrom-gpe-task-settings.bb
packages/devmem2/devmem2.bb
packages/directfb/directfb-examples_1.0.0.bb
packages/directfb/directfb_1.1.0.bb
packages/gcc/gcc-cross_3.3.3.bb
packages/gcc/gcc-cross_3.3.4.bb
packages/gcc/gcc-cross_3.4.3.bb
packages/gcc/gcc-cross_3.4.4.bb
packages/gcc/gcc-cross_4.0.0.bb
packages/gcc/gcc-cross_4.0.2.bb
packages/gcc/gcc-cross_4.1.0.bb
packages/gcc/gcc-cross_4.1.1.bb
packages/gcc/gcc-cross_4.1.2.bb
packages/gcc/gcc-cross_4.2.1.bb
packages/gcc/gcc-cross_4.2.2.bb
packages/gcc/gcc-cross_csl-arm-2005q3.bb
packages/gcc/gcc-cross_csl-arm-cvs.bb
packages/gcc/gcc-cross_csl-arm.bb
packages/gcc/gcc3-build.inc
packages/gcc/gcc_3.3.3.bb
packages/gcc/gcc_3.3.4.bb
packages/gcc/gcc_3.4.3.bb
packages/gcc/gcc_3.4.4.bb
packages/gcc/gcc_4.0.0.bb
packages/gcc/gcc_4.0.2.bb
packages/gcc/gcc_4.1.0.bb
packages/gcc/gcc_4.1.1.bb
packages/gcc/gcc_4.1.2.bb
packages/gcc/gcc_4.2.1.bb
packages/gcc/gcc_4.2.2.bb
packages/gcc/gcc_csl-arm-2005q3.bb
packages/gcc/gcc_csl-arm-cvs.bb
packages/gcc/gcc_csl-arm.bb
packages/ipkg/ipkg.inc
packages/ipkg/ipkg_0.99.163.bb
packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
packages/libungif/libungif_4.1.3.bb
packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/perl/libxml-parser-perl_2.34.bb
packages/psplash/files/angstrom/psplash-hand-img.h
packages/psplash/files/psplash-init
packages/psplash/psplash_svn.bb
packages/sofia-sip/sofia-sip_1.11.7.bb
packages/tasks/task-base.bb
packages/tasks/task-native-sdk.bb
packages/update-rc.d/update-rc.d_0.7.bb
packages/xkbd/xkbd-layout-ru_0.1.1.bb
packages/xkbd/xkbd_0.8.15.bb
packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
mtn:manual_merge
true
packages/python/python-pyqt_4.3.bb
packages/python/python-pyqt_4.3.1.bb
packages/python/python-sip_4.7.bb
packages/python/python-sip_4.7.1.bb
packages/sip/sip-native_4.7.bb
packages/sip/sip-native_4.7.1.bb
packages/python/python-pyqt/01_configure.dpatch
packages/python/python-pyqt/02_htmllinks.dpatch
packages/python/python-pyqt/03_qreal.dpatch
packages/python/python-pyqt/04_qreal_api_fixes.dpatch
classes/sip.bbclass
Diffs:
#
# mt diff -r49fb48a813e1e0d599f74dd7a809922ab71939b1 -r3fe444996883cc54a95f94bd89d9fba641d08c20
#
#
#
# delete "packages/psplash/files/angstrom/angstrom-psplash-qvga-img.h"
#
# delete "packages/psplash/files/angstrom/angstrom-psplash-vga-img.h"
#
# add_dir "packages/dropbear/dropbear-early"
#
# add_dir "packages/update-rc.d/files"
#
# add_dir "packages/xkbd/xkbd-layout-ru"
#
# add_file "contrib/angstrom/angstrom.png"
# content [9213fe50ab828fe0492d8c97cfdaf90e1c6c15cd]
#
# add_file "packages/directfb/files/fix-configure-include-path.patch"
# content [95a5712b69ed26362c0a8e8e8624e9b05fb506b2]
#
# add_file "packages/dropbear/dropbear-early/dropbear-early"
# content [e2408ee87210f48cc8b47a8f34b5bb1bf49cdba6]
#
# add_file "packages/dropbear/dropbear-early_1.0.bb"
# content [cdaf892564086415c02630de43886143350b375b]
#
# add_file "packages/gtk-webcore/midori_0.0.12.bb"
# content [248eb3a40d4c7bdb50c581812cdbeaeb356a89fd]
#
# add_file "packages/images/initramfs-bootmenu-image.bb"
# content [8f1db3a032593d55326052d8031210f27d4194a9]
#
# add_file "packages/ipkg/files/ipkg-configure"
# content [38012e0e1b7b0690b187e43e83c2e33fbc0bc9e8]
#
# add_file "packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb"
# content [252b9c26ddd2fda4271f4352999ce0facbfece99]
#
# add_file "packages/meta/external-toolchain.bb"
# content [32574844f3d4c4554cb6e4193123ab1c001b9046]
#
# add_file "packages/psplash/files/logo-math.patch"
# content [3863c6539054b0633895cdd79f7940fde4987c4f]
#
# add_file "packages/sofia-sip/sofia-sip_1.12.7.bb"
# content [bb742997aa1803f55576e4c877140c8956ea13ce]
#
# add_file "packages/update-rc.d/files/add-verbose.patch"
# content [048e2e241d96d7bbd0f1a8a75440348719c9a168]
#
# add_file "packages/xkbd/xkbd-0.8.15/differentiate-desktop-name.patch"
# content [5b3f1a05266b9f5386bba4d560d28692b8d75e45]
#
# add_file "packages/xkbd/xkbd-layout-ru/en-ru-123.xkbd"
# content [fbe00f80ca40257ecff86fb7d211b925edfa7b5b]
#
# add_file "packages/xorg-lib/libx11-native_1.0.3.bb"
# content [cdad9b5aab7c4683bfe87d0933aa450930c75451]
#
# add_file "packages/xorg-xserver/xserver-kdrive/00-xglamo-logs.patch"
# content [40fbc88aeca77b3ecfd3423640b5bb8c73ff2d8e]
#
# add_file "packages/xorg-xserver/xserver-kdrive/01-xglamo-scrolling-artifact-fix.patch"
# content [e1e35716d43087fd5b9c8998f1ae47c4a2f0d310]
#
# add_file "packages/xorg-xserver/xserver-kdrive/02-xglamo-no-dri.patch"
# content [d55aaf76a170f85331d871611303f1cd82979cd2]
#
# add_file "packages/xorg-xserver/xserver-kdrive/03-xglamo-no-vesa.patch"
# content [0d2f4f6126fdfc57820090618c5c6f64744550fc]
#
# patch "classes/nslu2-image.bbclass"
# from [3ba57cc877ce3060583122672952bf4a937be2d7]
# to [3be606504758bf5647ff8fed09280bbd1b34944c]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [c6bbfa10816eda24513e92b21827c75003bb4daa]
# to [0333915fd642b2db9af96929a6b9fd60df4292bc]
#
# patch "conf/machine/include/ixp4xx.inc"
# from [061e47cc6cd7843090e32bb8bbe59909e1f3df1e]
# to [9b1bce804bb05f3a19b3b29e053d8eeb3ee452d1]
#
# patch "conf/machine/mpc8313e-rdb.conf"
# from [ea78b004c7226c86a8a3cc969bf9582d74faaec6]
# to [74259c283b88887c4f38522bae31bc486a835867]
#
# patch "contrib/angstrom/angstrom.svg"
# from [b5659f7c38dc54dcc4ad153de0e5afa5ccefc00f]
# to [447e9be910fbd6667c31c1b301ee9896fd5e0b96]
#
# patch "packages/angstrom/angstrom-gpe-task-base.bb"
# from [30a23f6dee4925d21a3bf27405e8f4c25f29be2c]
# to [93d648076841f25d763321ea213968e31aac2624]
#
# patch "packages/angstrom/angstrom-gpe-task-settings.bb"
# from [04963f41f9195b2a20bddc9409a53ad153e779ff]
# to [e3e3966d2fb5eb15fbab7a53b32397746e21a4b1]
#
# patch "packages/devmem2/devmem2.bb"
# from [e6803ee2445609b09c3b9e7e69e2cfc7824d4d65]
# to [39279aa13e745b68c91754bed7bef12c96f23f74]
#
# patch "packages/directfb/directfb-examples_1.0.0.bb"
# from [88c9cc59f32b02ec4cd0c0f876b204399b265bdf]
# to [1905769a0ea0cc18c68ea7969adaa55fe65ad9aa]
#
# patch "packages/directfb/directfb_1.1.0.bb"
# from [c9da95fb956d450af0c360a3364023c960f9d1af]
# to [1af7bf22ffbfcbc869a08e6664c2dde2ff16c7d2]
#
# patch "packages/gcc/gcc-cross_3.3.3.bb"
# from [6f0e806dc7fb34d2c7d4d2c58d2af5788bda69fd]
# to [c8731c9792969eb812d5bd7fa81169abe1943c6a]
#
# patch "packages/gcc/gcc-cross_3.3.4.bb"
# from [8fbba8dba7728294fafecfd421f1e109e04062f4]
# to [ec2a0f85762af032808eb5b2f66ed466cea31b3d]
#
# patch "packages/gcc/gcc-cross_3.4.3.bb"
# from [a322dd0e92ed9ba15ff42b79006c5ef02a9c8f63]
# to [ce70bdb3ff0e605e841fa835bc20169914ea708a]
#
# patch "packages/gcc/gcc-cross_3.4.4.bb"
# from [b8e7c52063da4c9ec308b938054e366687c4ba1b]
# to [674605b2ebdca6409f1f687a9e7245c47464037d]
#
# patch "packages/gcc/gcc-cross_4.0.0.bb"
# from [3e8b17aa2b3b3c9889b1a5dce21167633321f10f]
# to [c79d4560cc3836f3ce5567ced695e38cd89cf6ff]
#
# patch "packages/gcc/gcc-cross_4.0.2.bb"
# from [c6d782f90db8ef7469907dbe927e7658eeef4380]
# to [a6084e5e13c9ec9dd14a200160e5084964df24f4]
#
# patch "packages/gcc/gcc-cross_4.1.0.bb"
# from [45388d846b16babd384838804fecc6bca37d6ee2]
# to [4f00addbaa7626b70215367ef53de6d49b4c6a7e]
#
# patch "packages/gcc/gcc-cross_4.1.1.bb"
# from [02563fd2f77f8a3edb59f78ce061728160b4b50a]
# to [58ae5981f8140e05dac1bd3269a880d0ddbbd0d6]
#
# patch "packages/gcc/gcc-cross_4.1.2.bb"
# from [08a75f7777c10e0526242d4021330547bddfd7d3]
# to [110264dc0f77a52cf1c9af1c384778715c290d17]
#
# patch "packages/gcc/gcc-cross_4.2.1.bb"
# from [8c369284668b4f7e7cd8104c4e8ee7df156518d9]
# to [5ef221a66a8deb2c9907050226443b591077ebc2]
#
# patch "packages/gcc/gcc-cross_4.2.2.bb"
# from [fb8c2385fd08a3e2000d725d7155b0118591e2b7]
# to [db2829fa431c6b82c542cae426ddc639e77aa4db]
#
# patch "packages/gcc/gcc-cross_csl-arm-2005q3.bb"
# from [620960ed7c7528e82c79547f5a83220a7b925cbc]
# to [cf1c1b76e78fa9d9b44d86914d69b86725561090]
#
# patch "packages/gcc/gcc-cross_csl-arm-cvs.bb"
# from [72b603afec09044056748f35d3ecfe875cf7d2cb]
# to [f4cef10fc748bb75954b41429d56a9a103075703]
#
# patch "packages/gcc/gcc-cross_csl-arm.bb"
# from [d4d43252930c1c95e56323cadc16dca4305bb6e2]
# to [8d4cc844ecafb7450db0a445be3261b3481dfc48]
#
# patch "packages/gcc/gcc3-build.inc"
# from [fd1d8e1a435e000a557d01da93aafa359e8f84ba]
# to [cc6ebb92d3e84b79c50cab4d8db8607496d214d7]
#
# patch "packages/gcc/gcc_3.3.3.bb"
# from [f2de34b11bd556c90a0c261c303e4775ba238ba7]
# to [6f5679ab6302d65b9cc1de9ca186011573c1d75a]
#
# patch "packages/gcc/gcc_3.3.4.bb"
# from [97a6eb12ca7216f331610a86b2a2626dfe946d7f]
# to [b7c6e045d8bbd233c2353965670b5a355468c90d]
#
# patch "packages/gcc/gcc_3.4.3.bb"
# from [49e5bdf8e913ce51cbe10c8123ec4c8222cee6de]
# to [68d2755766c4adc56e0951a6de246394270d7d9f]
#
# patch "packages/gcc/gcc_3.4.4.bb"
# from [704138b111356a365db42ff4e06d2cbed273572e]
# to [8218fda182662f3f4bcb0f5857619e901d8b6484]
#
# patch "packages/gcc/gcc_4.0.0.bb"
# from [cecd6ee67910ba3a102d08f3e64fa697dc807f38]
# to [a8f79504565dce0ccceb3bced8c8c874caf13f5e]
#
# patch "packages/gcc/gcc_4.0.2.bb"
# from [974343b9064851c8a4269daa09a344738c7819f2]
# to [0156b0ed1e59ed7e6319931b8637568457eb1a94]
#
# patch "packages/gcc/gcc_4.1.0.bb"
# from [f35337d98d662c86f98faa30e09d3a4a0c8e5422]
# to [969b03f6753406d3c1fc57118391e227359539c8]
#
# patch "packages/gcc/gcc_4.1.1.bb"
# from [7134e088d48fb7b045110619d8f83e6e71f809e4]
# to [ba26064f61c07690d6fc9e80c2083fa783cec5ff]
#
# patch "packages/gcc/gcc_4.1.2.bb"
# from [68eac9378be7e37e7c220f6cc6c2e8e2918b3821]
# to [66c1a6be00672f5a37ab8c37aaee4c3c6b0713d6]
#
# patch "packages/gcc/gcc_4.2.1.bb"
# from [bbd5cdf1af6cbc7657cac1beb5869b7583d63035]
# to [755943c06b7920f669b3a3f3e1baf2e9d2a97645]
#
# patch "packages/gcc/gcc_4.2.2.bb"
# from [9431e24ceb8ddbf95f188a082285df6221e06508]
# to [53244c4e795291ca862fb5b92fb62d5191081c67]
#
# patch "packages/gcc/gcc_csl-arm-2005q3.bb"
# from [8da5c18425c9c55a4af88ece5a0f5b9bc932cb75]
# to [ad2f03778a959baa857452a7fd577ac3b58442f1]
#
# patch "packages/gcc/gcc_csl-arm-cvs.bb"
# from [32372dbc5acdc5140d5e1e72ba9d411bbff82661]
# to [5c616f992fbd43d7d08e27e1ee87b070a8744385]
#
# patch "packages/gcc/gcc_csl-arm.bb"
# from [c5d6da9de408aa3b9f50fe693976df60f07d258f]
# to [be88b779fd830c2162ec449171ff0dfe44217010]
#
# patch "packages/ipkg/ipkg.inc"
# from [d30b7883173e0c568eca20df33d213945f55d864]
# to [fc113df6d214da7a33273c7512dac5215da76f90]
#
# patch "packages/ipkg/ipkg_0.99.163.bb"
# from [eb539f2d4afc5f5d3617816a1d41afb6953cd070]
# to [3a58f561fcf234def5a100e624f4c721f8694641]
#
# patch "packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb"
# from [78905ac03fe3db35fb352b69c6d94fa42889ce6a]
# to [9ec0920876981474a325a47766fa7d50bbb1cfd3]
#
# patch "packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb"
# from [d35a7304f640113a413721c8b4758cfad4a17c72]
# to [f248fbf9a457e0555c36e5377bc412ced8f568db]
#
# patch "packages/libungif/libungif_4.1.3.bb"
# from [749851b5ad634df7ec9f6cd59ea1d85ea18d9f9a]
# to [f24748385903ac535f59065d84441ff4ad58742e]
#
# patch "packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
# from [17503c55f830f3a3deb1876d7d390a42edb3bc6b]
# to [bc9b6320d36d6556339ca6526a84f192b7c3f86f]
#
# patch "packages/perl/libxml-parser-perl_2.34.bb"
# from [9fe85cf758444af63185e9cfaffa8e9c253451ce]
# to [df4c8dc1823ab29c423c8b3de34f375a43450cb0]
#
# patch "packages/psplash/files/angstrom/psplash-hand-img.h"
# from [01b8752ff29f7c525a80ea6b1a8d4bad2b5df6b5]
# to [577b452f887a9b23c1d553da6633798490f07e95]
#
# patch "packages/psplash/files/psplash-init"
# from [3772ad3a62a548c557d719d87d586d1d4ea6044f]
# to [920674c4b9876275351f49712ab0fa731a6ca7a9]
#
# patch "packages/psplash/psplash_svn.bb"
# from [4614b6fa0d17df94d33a6949963375bf587e08e7]
# to [5f388d9f92a2d8c405d7d667d3c6c45c288c82bb]
#
# patch "packages/sofia-sip/sofia-sip_1.11.7.bb"
# from [fab26d2789f54659dc4e8c68214f14cf016c94e7]
# to [83b18f606b66c599ad5d66057b22875655622b58]
#
# patch "packages/tasks/task-base.bb"
# from [6f33e4ea8083953d24993dca089ae71114f8a639]
# to [bd9f0978ca2a00519da16302f7e73d3fad3879fd]
#
# patch "packages/tasks/task-native-sdk.bb"
# from [7a8357c0638184a616c5933e9d5a31908b09a3e0]
# to [e9aff3af03f3423a34dcb2853582e08fdd66a6a5]
#
# patch "packages/update-rc.d/update-rc.d_0.7.bb"
# from [28b3abe47b31ca41c3a409d73fa6383056db6bf2]
# to [db8c8fda3527ff9f206b916648f803b0b9f08adb]
#
# patch "packages/xkbd/xkbd-layout-ru_0.1.1.bb"
# from [f6660e1740ac5bf87fb2dd36aeba4e17dd585cfa]
# to [5d506235088e5e21a91d23d03a7196ff1c569c49]
#
# patch "packages/xkbd/xkbd_0.8.15.bb"
# from [9013b4a317fe2b993dc22cd9fae92e3e670c0939]
# to [087f363f1700e269f80d882f9ef70135bee264d9]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb"
# from [31f806960351e14859e325b9073986126a23ca3a]
# to [f9825c85f0e52ef579e9bef9ad5f2469dae32694]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/Xserver"
# from [1e81dbe9f52b510804a38b11386d85bcfad8085c]
# to [e821c51279e2a4f57e41bfef13c8b1ee196e71c2]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
# from [4475aa19d15d8d38e8e7b1fa831c3c012ef9c190]
# to [82f390a2257420604caa01ac186221938ae505ce]
#
# set "contrib/angstrom/angstrom.png"
# attr "mtn:manual_merge"
# value "true"
#
============================================================
# contrib/angstrom/angstrom.png is binary
============================================================
--- packages/directfb/files/fix-configure-include-path.patch 95a5712b69ed26362c0a8e8e8624e9b05fb506b2
+++ packages/directfb/files/fix-configure-include-path.patch 95a5712b69ed26362c0a8e8e8624e9b05fb506b2
@@ -0,0 +1,13 @@
+--- DirectFB-1.1.0/configure.in-orig 2007-08-27 00:07:00.000000000 -0700
++++ DirectFB-1.1.0/configure.in 2007-11-26 12:05:52.000000000 -0800
+@@ -1380,8 +1380,8 @@
+
+ MODULEDIR=$libdir/$MODULEDIRNAME
+ DATADIR=$datadir/directfb-$VERSION
+-INCLUDEDIR=$includedir/directfb
+-INTERNALINCLUDEDIR=$includedir/directfb-internal
++INCLUDEDIR=$includedir/
++INTERNALINCLUDEDIR=$includedir/
+
+ SOPATH=$libdir/libdirectfb-$LT_RELEASE.so.$LT_CURRENT
+ AC_SUBST(SOPATH)
============================================================
--- packages/dropbear/dropbear-early/dropbear-early e2408ee87210f48cc8b47a8f34b5bb1bf49cdba6
+++ packages/dropbear/dropbear-early/dropbear-early e2408ee87210f48cc8b47a8f34b5bb1bf49cdba6
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+for x in $(cat /proc/cmdline); do
+ case $x in
+ dropbear=early)
+ echo "Starting dropbear early"
+ exec /etc/init.d/dropbear $*
+ ;;
+ esac
+done
============================================================
--- packages/dropbear/dropbear-early_1.0.bb cdaf892564086415c02630de43886143350b375b
+++ packages/dropbear/dropbear-early_1.0.bb cdaf892564086415c02630de43886143350b375b
@@ -0,0 +1,17 @@
+DESCRIPTION = "Allow to start dropbear soon after boot, depending on kernel command line option."
+SECTION = "devel"
+PR = "r1"
+
+SRC_URI = "file://dropbear-early"
+
+inherit update-rc.d
+
+do_install() {
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/${INITSCRIPT_NAME} ${D}${sysconfdir}/init.d/
+}
+
+PACKAGE_ARCH = "all"
+
+INITSCRIPT_NAME = "dropbear-early"
+INITSCRIPT_PARAMS = "start 00 S ."
============================================================
--- packages/gtk-webcore/midori_0.0.12.bb 248eb3a40d4c7bdb50c581812cdbeaeb356a89fd
+++ packages/gtk-webcore/midori_0.0.12.bb 248eb3a40d4c7bdb50c581812cdbeaeb356a89fd
@@ -0,0 +1,11 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "webkit-gtk libsexy"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \
+ "
+
+
============================================================
--- packages/images/initramfs-bootmenu-image.bb 8f1db3a032593d55326052d8031210f27d4194a9
+++ packages/images/initramfs-bootmenu-image.bb 8f1db3a032593d55326052d8031210f27d4194a9
@@ -0,0 +1,11 @@
+# Sample initramfs image
+
+IMAGE_INSTALL = "busybox-static initramfs-module-bootmenu"
+IMAGE_LINGUAS = ""
+
+# Remove any kernel-image that the kernel-module-* packages may have pulled in.
+PACKAGE_REMOVE = "kernel-image-* update-modules module-init-tools-depmod uclibc update-rc.d"
+ROOTFS_POSTPROCESS_COMMAND += "ipkg-cl ${IPKG_ARGS} -force-depends \
+ remove ${PACKAGE_REMOVE};"
+
+inherit image
============================================================
--- packages/ipkg/files/ipkg-configure 38012e0e1b7b0690b187e43e83c2e33fbc0bc9e8
+++ packages/ipkg/files/ipkg-configure 38012e0e1b7b0690b187e43e83c2e33fbc0bc9e8
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo "Starting to configure packages..."
+ipkg-cl configure
+echo "Finished to configure packages."
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb 252b9c26ddd2fda4271f4352999ce0facbfece99
+++ packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb 252b9c26ddd2fda4271f4352999ce0facbfece99
@@ -0,0 +1,11 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
+LICENSE = "GPL"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+ file://defconfig"
+
+require linux-handhelds-2.6.inc
============================================================
--- packages/meta/external-toolchain.bb 32574844f3d4c4554cb6e4193123ab1c001b9046
+++ packages/meta/external-toolchain.bb 32574844f3d4c4554cb6e4193123ab1c001b9046
@@ -0,0 +1,50 @@
+DESCRIPTION = "This package allows OE to work with an external toolchain generated \
+ by meta-toolchain instead of building its own. It expects that toolchain \
+ to be located in SDK_PREFIX/prefix."
+
+PROVIDES = "\
+ linux-libc-headers \
+ virtual/${TARGET_PREFIX}gcc \
+ virtual/${TARGET_PREFIX}gcc-initial \
+ virtual/${TARGET_PREFIX}binutils \
+ virtual/${TARGET_PREFIX}libc-for-gcc \
+ virtual/libc \
+ virtual/libintl \
+ virtual/libiconv \
+ glibc-thread-db \
+ virtual/linux-libc-headers \
+ "
+
+RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++"
+PACKAGES_DYNAM%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r6fe2cd0b60b675a1e3118d25934adb4693f3b8ed -r3fe444996883cc54a95f94bd89d9fba641d08c20
#
#
#
# rename "packages/python/python-pyqt_4.3.bb"
# to "packages/python/python-pyqt_4.3.1.bb"
#
# rename "packages/python/python-sip_4.7.bb"
# to "packages/python/python-sip_4.7.1.bb"
#
# rename "packages/sip/sip-native_4.7.bb"
# to "packages/sip/sip-native_4.7.1.bb"
#
# add_file "packages/python/python-pyqt/01_configure.dpatch"
# content [5b49b7941b292d481567646baa9bfc55f136991a]
#
# add_file "packages/python/python-pyqt/02_htmllinks.dpatch"
# content [534f1ff07ecb9dda3df8578b0f519f2967355828]
#
# add_file "packages/python/python-pyqt/03_qreal.dpatch"
# content [9a40f85e33a44c1a534b1b2ece3551330dd9b6b7]
#
# add_file "packages/python/python-pyqt/04_qreal_api_fixes.dpatch"
# content [b49206192d795e4330d8d33ff0a24d738881ae28]
#
# patch "classes/sip.bbclass"
# from [4012d4828567e24b5d46a88b61b5f951b18ae7f3]
# to [a9ed0b070fecb4888c0a73be816865c0285ba605]
#
# patch "packages/python/python-pyqt_4.3.1.bb"
# from [77a66605090e9cc41d463370b73d4eab1a9824a0]
# to [ba7b95e381ea4abf18b5fb46f9e7d39d05d8198d]
#
# patch "packages/python/python-sip_4.7.1.bb"
# from [57b117962adb2967fdbc967fcb574e700f5ca7b4]
# to [d8d87c9c9274fd8bee9fb3039cbfae7fc35f6976]
#
# patch "packages/sip/sip-native_4.7.1.bb"
# from [ffb9c2a06301e9a83d6937e2920959e47eda7f25]
# to [6b5151de537d212e9876f8f80461628cffaa2040]
#
============================================================
--- packages/python/python-pyqt/01_configure.dpatch 5b49b7941b292d481567646baa9bfc55f136991a
+++ packages/python/python-pyqt/01_configure.dpatch 5b49b7941b292d481567646baa9bfc55f136991a
@@ -0,0 +1,288 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_configure.dpatch by Torsten Marek <shlomme at debian.org>
+##
+## DP: Make PyQt4 objectdir-buildable
+
+ at DPATCH@
+diff -urNad python-qt4-4.2+snapshot20070727~/configure.py python-qt4-4.2+snapshot20070727/configure.py
+--- python-qt4-4.2+snapshot20070727~/configure.py 2007-07-29 23:58:48.000000000 +0200
++++ python-qt4-4.2+snapshot20070727/configure.py 2007-07-30 00:00:17.000000000 +0200
+@@ -20,6 +20,8 @@
+ # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+
++# Modified for Debian by Torsten Marek <shlomme at gmx.net>
++
+ import sys
+ import os
+ import string
+@@ -29,6 +31,23 @@
+
+ import sipconfig
+
++topsrcdir = os.path.dirname(os.path.abspath(__file__))
++has_objdir = topsrcdir != os.path.abspath(os.path.curdir)
++if not has_objdir:
++ topsrcdir = None
++
++
++def makeDir(dirname):
++ try:
++ os.mkdir(dirname)
++ except OSError, e:
++ if e.errno != 17:
++ raise
++
++def srcPath(filename):
++ if topsrcdir is not None:
++ return os.path.join(topsrcdir, filename)
++ return filename
+
+ # Initialise the globals.
+ pyqt_version = 0x040200
+@@ -134,6 +153,8 @@
+ p.add_option("-g", "--consolidate", action="store_true", default=False,
+ dest="bigqt", help="create a single module which links against "
+ "all the Qt libraries")
++ p.add_option("--disable-designer-plugin", action="store_true", default=False,
++ help="do not build the Qt Designer plugin")
+
+ # These are internal options used to build the mega Windows GPL package.
+ p.add_option("--mwg-openssl", action="callback", default=None,
+@@ -282,6 +303,7 @@
+ check_module("QAxContainer", "qaxobject.h", "new QAxObject()",
+ extra_libs=["QAxContainer"])
+
++ makeDir("dbus")
+ if os.path.isdir("dbus"):
+ check_dbus()
+
+@@ -354,7 +376,7 @@
+ generate_code("QtAssistant")
+
+ if "QtDesigner" in pyqt_modules:
+- qpy_dir = os.path.abspath(os.path.join("qpy", "QtDesigner"))
++ qpy_dir = os.path.abspath(srcPath(os.path.join("qpy", "QtDesigner")))
+
+ if sys.platform == "win32":
+ if opts.debug:
+@@ -380,10 +402,10 @@
+
+ # Generate the composite module.
+ qtmod_sipdir = os.path.join("sip", "Qt")
+- mk_clean_dir(qtmod_sipdir)
++ mk_clean_dir(srcPath(qtmod_sipdir))
+
+ qtmod_sipfile = os.path.join(qtmod_sipdir, "Qtmod.sip")
+- f = open(qtmod_sipfile, "w")
++ f = open(srcPath(qtmod_sipfile), "w")
+
+ f.write("""%CompositeModule PyQt4.Qt
+
+@@ -555,7 +577,7 @@
+ return libs, libdirs
+
+ def module_installs(self):
+- return ["__init__.py", "pyqtconfig.py"]
++ return [srcPath("__init__.py"), "pyqtconfig.py"]
+
+ def qpylibs(self):
+ # See which QPy libraries to build.
+@@ -571,8 +593,8 @@
+ for qpy, pro in qpylibs.iteritems():
+ sipconfig.inform("Creating QPy library for %s Makefile..." % qpy)
+
+- os.chdir(os.path.join("qpy", qpy))
+-
++ os.chdir(srcPath(os.path.join("qpy", qpy)))
++
+ if sipcfg.universal:
+ upro = "u_" + pro
+
+@@ -596,6 +618,8 @@
+
+ sipconfig.inform("Creating QPy libraries Makefile...")
+
++ makeDir("qpy")
++ os.system("ln -s %s qpy/QtDesigner" % (srcPath("qpy/QtDesigner"),))
+ sipconfig.ParentMakefile(
+ configuration=sipcfg,
+ dir="qpy",
+@@ -617,6 +641,7 @@
+ install_dir=pydbusmoddir,
+ qt=["QtCore"],
+ debug=opts.debug,
++ topsrcdir=topsrcdir,
+ universal=sipcfg.universal
+ )
+
+@@ -625,18 +650,19 @@
+ makefile.generate()
+ tool.append("dbus")
+
+- # Only include ElementTree for older versions of Python.
+- if sipcfg.py_version < 0x020500:
+- sipconfig.inform("Creating elementtree Makefile...")
++ # Don't include elementtree on Debian
++## # Only include ElementTree for older versions of Python.
++## if sipcfg.py_version < 0x020500:
++## sipconfig.inform("Creating elementtree Makefile...")
+
+- makefile = sipconfig.PythonModuleMakefile(
+- configuration=sipcfg,
+- dstdir=os.path.join(pyqt_modroot, "elementtree"),
+- dir="elementtree"
+- )
++## makefile = sipconfig.PythonModuleMakefile(
++## configuration=sipcfg,
++## dstdir=os.path.join(pyqt_modroot, "elementtree"),
++## dir="elementtree"
++## )
+
+- makefile.generate()
+- tool.append("elementtree")
++## makefile.generate()
++## tool.append("elementtree")
+
+ # Create the pyuic4 wrapper. Use the GUI version on MacOS (so that
+ # previews work properly and normal console use will work anyway), but
+@@ -644,16 +670,18 @@
+ sipconfig.inform("Creating pyuic4 wrapper...")
+
+ uicdir=os.path.join(pyqt_modroot, "uic")
+- wrapper = sipconfig.create_wrapper(os.path.join(uicdir, "pyuic.py"), os.path.join("pyuic", "pyuic4"), (sys.platform == "darwin"))
++ makeDir("pyuic")
++ # Wrapper script is not needed on Debian
++ #wrapper = sipconfig.create_wrapper(os.path.join(uicdir, "pyuic.py"), os.path.join("pyuic", "pyuic4"), (sys.platform == "darwin"))
+
+ sipconfig.inform("Creating pyuic4 Makefile...")
+
+ makefile = sipconfig.PythonModuleMakefile(
+ configuration=sipcfg,
+ dstdir=uicdir,
+- srcdir="uic",
++ srcdir=srcPath(os.path.join("pyuic", "uic")),
+ dir="pyuic",
+- installs=[[os.path.basename(wrapper), opts.pyqtbindir]]
++ #installs=[[os.path.basename(wrapper), opts.pyqtbindir]]
+ )
+
+ makefile.generate()
+@@ -661,7 +689,7 @@
+
+ if "QtXml" in pyqt_modules:
+ sipconfig.inform("Creating pylupdate4 Makefile...")
+-
++ makeDir("pylupdate")
+ makefile = sipconfig.ProgramMakefile(
+ configuration=sipcfg,
+ build_file="pylupdate.sbf",
+@@ -671,14 +699,15 @@
+ qt=["QtCore", "QtGui", "QtXml"],
+ debug=opts.debug,
+ warnings=1,
++ topsrcdir=topsrcdir,
+ universal=sipcfg.universal
+ )
+-
++ makefile.extra_include_dirs.append(srcPath("pylupdate"))
+ makefile.generate()
+ tool.append("pylupdate")
+
+ sipconfig.inform("Creating pyrcc4 Makefile...")
+-
++ makeDir("pyrcc")
+ makefile = sipconfig.ProgramMakefile(
+ configuration=sipcfg,
+ build_file="pyrcc.sbf",
+@@ -688,6 +717,7 @@
+ qt=["QtCore", "QtXml"],
+ debug=opts.debug,
+ warnings=1,
++ topsrcdir=topsrcdir,
+ universal=sipcfg.universal
+ )
+
+@@ -697,7 +727,7 @@
+ sipconfig.inform("pylupdate4 and pyrcc4 will not be built because the Qt XML module is missing.")
+
+ if "QtDesigner" in pyqt_modules:
+- enabled = True
++ enabled = not opts.disable_designer_plugin
+
+ py_major = sipcfg.py_version >> 16
+ py_minor = (sipcfg.py_version >> 8) & 0x0ff
+@@ -731,7 +761,7 @@
+ # Run qmake to generate the Makefile.
+ qmake_args = fix_qmake_args()
+ cwd = os.getcwd()
+- os.chdir("designer")
++ os.chdir(srcPath("designer"))
+
+ # Create the qmake project file.
+ fin = open("python.pro-in")
+@@ -755,7 +785,7 @@
+ run_command("%s %s" % (opts.qmake, qmake_args))
+ os.chdir(cwd)
+
+- tool.append("designer")
++ tool.append(srcPath("designer"))
+
+ return tool
+
+@@ -899,7 +929,6 @@
+ add_makefile_extras(makefile, extra_include_dirs, extra_lib_dirs, extra_libs)
+
+ exe, build = makefile.build_command(name)
+-
+ # Make sure the executable file doesn't exist.
+ remove_file(exe)
+ run_command(build)
+@@ -1025,7 +1054,7 @@
+ return
+
+ # Check the module's main .sip file exists.
+- if os.access(os.path.join("sip", mname, mname + "mod.sip"), os.F_OK):
++ if os.access(srcPath(os.path.join("sip", mname, mname + "mod.sip")), os.F_OK):
+ sipconfig.inform("Checking to see if the %s module should be built..." % mname)
+
+ if check_api(incfile, test, mname, extra_include_dirs=extra_include_dirs, extra_lib_dirs=extra_lib_dirs, extra_libs=extra_libs):
+@@ -1226,10 +1255,14 @@
+ argv.append(buildfile)
+
+ argv.append("-I")
+- argv.append("sip")
++ argv.append(srcPath("sip"))
+
+ # SIP assumes POSIX style path separators.
+- argv.append(string.join(["sip", mname, mname + "mod.sip"], "/"))
++ if topsrcdir is not None:
++ argv.append(string.join([topsrcdir, "sip", mname, mname + "mod.sip"], "/"))
++ else:
++ argv.append(string.join(["sip", mname, mname + "mod.sip"], "/"))
++
+
+ cmd = string.join(argv)
+
+@@ -1251,7 +1284,11 @@
+ sipfiles = []
+
+ for s in glob.glob("sip/" + mname + "/*.sip"):
+- sipfiles.append(os.path.join("..", "sip", mname, os.path.basename(s)))
++ if has_objdir:
++ topdir = topsrcdir
++ else:
++ topdir = ".."
++ sipfiles.append(os.path.join(topdir, "sip", mname, os.path.basename(s)))
+
+ installs.append([sipfiles, os.path.join(opts.pyqtsipdir, mname)])
+
+@@ -1835,7 +1872,7 @@
+ ).generate()
+
+ # Install the configuration module.
+- create_config("pyqtconfig.py", "pyqtconfig.py.in", macros)
++ create_config("pyqtconfig.py", srcPath("pyqtconfig.py.in"), macros)
+
+
+ ###############################################################################
============================================================
--- packages/python/python-pyqt/02_htmllinks.dpatch 534f1ff07ecb9dda3df8578b0f519f2967355828
+++ packages/python/python-pyqt/02_htmllinks.dpatch 534f1ff07ecb9dda3df8578b0f519f2967355828
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_htmllinks.dpatch by Torsten Marek <shlomme at debian.org>
+
+## DP: Fix the links in the documentation HTML files.
+
+ at DPATCH@
+diff -urNad python-qt4-4.1~/doc/pyqt4ref.html python-qt4-4.1/doc/pyqt4ref.html
+--- python-qt4-4.1~/doc/pyqt4ref.html 2006-11-05 00:51:19.000000000 +0100
++++ python-qt4-4.1/doc/pyqt4ref.html 2006-11-21 23:35:52.000000000 +0100
+@@ -85,7 +85,7 @@
+ <p>This is the reference guide for PyQt 4.1. PyQt v4 is a set of
+ <a class="reference" href="http://www.python.org">Python</a> bindings for v4 of the Qt application
+ framework from <a class="reference" href="http://www.trolltech.com">Trolltech</a>.</p>
+-<p>There is a separate <a class="reference" href="html/classes.html">PyQt API Reference</a>.</p>
++<p>There is a separate <a class="reference" href="classes.html">PyQt API Reference</a>.</p>
+ <p>Qt is a set of C++ libraries and development tools that includes platform
+ independent abstractions for graphical user interfaces, networking, threads,
+ Unicode, regular expressions, SQL databases, SVG, OpenGL, XML, and user and
============================================================
--- packages/python/python-pyqt/03_qreal.dpatch 9a40f85e33a44c1a534b1b2ece3551330dd9b6b7
+++ packages/python/python-pyqt/03_qreal.dpatch 9a40f85e33a44c1a534b1b2ece3551330dd9b6b7
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_qreal.dpatch by Torsten Marek <shlomme at debian.org>
+##
+## DP: On ARM, ARMEL, Mips and Mipsel, qreal is a float, not a double.
+
+ at DPATCH@
+diff -urNad python-qt4-4.3~/sip/QtCore/qglobal.sip python-qt4-4.3/sip/QtCore/qglobal.sip
+--- python-qt4-4.3~/sip/QtCore/qglobal.sip 2007-08-07 21:52:15.000000000 +0200
++++ python-qt4-4.3/sip/QtCore/qglobal.sip 2007-08-07 22:10:14.000000000 +0200
+@@ -46,7 +46,7 @@
+ typedef unsigned long long quint64;
+ typedef qint64 qlonglong;
+ typedef quint64 qulonglong;
+-typedef double qreal;
++typedef float qreal;
+ typedef unsigned char uchar;
+ typedef unsigned short ushort;
+ typedef unsigned int uint;
============================================================
--- packages/python/python-pyqt/04_qreal_api_fixes.dpatch b49206192d795e4330d8d33ff0a24d738881ae28
+++ packages/python/python-pyqt/04_qreal_api_fixes.dpatch b49206192d795e4330d8d33ff0a24d738881ae28
@@ -0,0 +1,259 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_qreal_api_fixes.dpatch by Torsten Marek <shlomme at debian.org>
+##
+## DP: Exchanges double by qreal in some wrapped methods.
+
+ at DPATCH@
+diff -urNad python-qt4-4.3~/sip/QtCore/qlist.sip python-qt4-4.3/sip/QtCore/qlist.sip
+--- python-qt4-4.3~/sip/QtCore/qlist.sip 2007-09-02 00:35:50.000000000 +0200
++++ python-qt4-4.3/sip/QtCore/qlist.sip 2007-09-02 00:35:53.000000000 +0200
+@@ -322,8 +322,8 @@
+ %End
+ };
+ %If (Qt_4_3_0 -)
+-// QList<QPair<double, double> > is implemented as a Python list of 2-element tuples.
+-%MappedType QList<QPair<double, double> >
++// QList<QPair<float, float> > is implemented as a Python list of 2-element tuples.
++%MappedType QList<QPair<float, float> >
+ {
+ %TypeHeaderCode
+ #include <qlist.h>
+@@ -340,7 +340,7 @@
+ // Set the list elements.
+ for (int i = 0; i < sipCpp->size(); ++i)
+ {
+- const QPair<double, double> &p = sipCpp->at(i);
++ const QPair<float, float> &p = sipCpp->at(i);
+ PyObject *pobj;
+
+ if ((pobj = Py_BuildValue((char *)"dd", p.first, p.second)) == NULL)
+@@ -370,16 +370,16 @@
+ return 1;
+ }
+
+- QList<QPair<double, double> > *ql = new QList<QPair<double, double> >;
++ QList<QPair<float, float> > *ql = new QList<QPair<float, float> >;
+
+ for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+ {
+ PyObject *tup = PyList_GET_ITEM(sipPy, i);
+
+- double first = PyFloat_AsDouble(PyTuple_GET_ITEM(tup, 0));
+- double second = PyFloat_AsDouble(PyTuple_GET_ITEM(tup, 1));
++ float first = PyFloat_AsDouble(PyTuple_GET_ITEM(tup, 0));
++ float second = PyFloat_AsDouble(PyTuple_GET_ITEM(tup, 1));
+
+- ql->append(QPair<double, double>(first, second));
++ ql->append(QPair<float, float>(first, second));
+ }
+
+ *sipCppPtr = ql;
+@@ -389,9 +389,9 @@
+ };
+ %End
+ %If (Qt_4_3_0 %s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list