[oe-commits] org.oe.dev merge of '909c536d732a709ac1bbe82a546de7dade5fdf07'
freyther commit
openembedded-commits at lists.openembedded.org
Wed Dec 26 12:18:58 UTC 2007
merge of '909c536d732a709ac1bbe82a546de7dade5fdf07'
and 'dafddd1d044d96ecf2e968c17c56e4f9f332240d'
Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: c70e0edf55d8daad66cd664301fbfc27f2386625
ViewMTN: http://monotone.openembedded.org/revision/info/c70e0edf55d8daad66cd664301fbfc27f2386625
Files:
1
packages/poppler/poppler0.6_cvs.bb
packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch
packages/apex/files
packages/apex/apex-nslu2-1.5.8
packages/apex/files/defconfig-16mb
packages/apex/apex-nslu2-16mb-1.5.8/defconfig
packages/apex/files/find-apex-partition.patch
packages/navit/navit_cvs.bb
packages/navit/navit_0.0.3.bb
packages/roadmap/files/qt/roadmap.desktop.patch
packages/roadmap/files/roadmap.desktop.patch
packages/roadmap/roadmap-gtk2_cvs.bb
packages/roadmap/roadmap-gtk2_1.1.0.bb
contrib/deploy
contrib/deploy/nfs
packages/apex/apex-nslu2-1.5.13
packages/apex/apex-nslu2-16mb-1.5.13
packages/apex/apex-nslu2-16mb-1.5.8
packages/matchbox-applet-startup-monitor/files
packages/roadmap/roadmap-gtk2-1.0.12
contrib/deploy/README
contrib/deploy/nfs/exports.sample
contrib/deploy/nfs/oe-nfs-deploy-image
packages/apex/apex-env_1.5.13.bb
packages/apex/apex-nslu2-1.5.13/defconfig
packages/apex/apex-nslu2-16mb-1.5.13/defconfig
packages/apex/apex-nslu2-16mb_1.5.13.bb
packages/apex/apex-nslu2_1.5.13.bb
packages/matchbox-applet-startup-monitor/files/mb-applet-startup-monitor.desktop
packages/navit/navit.inc
packages/octave/octave_3.0.0.bb
packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch
packages/roadmap/roadmap-gtk2_1.0.12.bb
packages/slugos-init/slugos-init_4.8.bb
packages/xorg-xserver/xserver-kdrive-1.3.0.0/tosa-fbdev.patch
conf/distro/include/angstrom-2007-preferred-versions.inc
conf/distro/include/sane-srcdates.inc
conf/distro/include/slugos.inc
contrib/angstrom/build-feeds.sh
contrib/angstrom/build-release.sh
packages/angstrom/angstrom-gpe-task-base.bb
packages/apex/apex-nslu2-16mb_1.5.8.bb
packages/bluez/bluez-utils/hciattach-ti-bts.patch
packages/bluez/bluez-utils3.inc
packages/bluez/bluez-utils_3.23.bb
packages/images/base-image.bb
packages/images/minimal-gpe-image.bb
packages/images/nas-server-image.bb
packages/initrdscripts/files/30-bootmenu.sh
packages/initrdscripts/files/80-nfsboot.sh
packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
packages/initrdscripts/initramfs-module-nfs_1.0.bb
packages/kismet/kismet_2007-10-R1.bb
packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig
packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch
packages/linux/linux-rp_2.6.23.bb
packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb
packages/navit/navit_0.0.1.bb
packages/navit/navit_0.0.2.bb
packages/python/python-pyqt_4.3.3.bb
packages/roadmap/roadmap.inc
packages/roadmap/zroadmap_1.0.12.bb
packages/roadmap/zroadmap_1.1.0.bb
packages/roadmap/zroadmap_cvs.bb
packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
packages/zaurus-updater/zaurus-updater/updater.sh
packages/zaurus-updater/zaurus-updater.bb
mtn:execute
true
packages/qmake/qmake2-native-2.10a
packages/qmake/qmake2-native
packages/qmake/qmake2-native_2.10a.bb
packages/qmake/qmake2-native.inc
packages/qt/qt4-x11-free-4.1.2
packages/qt4/qt4-x11-free-4.1.2
packages/qt/qt4-x11-free-4.3.2
packages/qt4/qt4-x11-free-4.3.3
packages/qt/qt4-x11-free_4.1.2.bb
packages/qt4/qt4-x11-free_4.1.2.bb
packages/qt/qt4-x11-free_4.3.2.bb
packages/qt4/qt4-x11-free_4.3.3.bb
packages/qt/qt4_arch.inc
packages/qt4/qt4_arch.inc
packages/qte/qtopia-core
packages/qt4/qtopia-core
packages/qte/qtopia-core_4.2.0.bb
packages/qt4/qtopia-core_4.2.0.bb
packages/qte/qtopia-core_4.3.2.bb
packages/qt4/qtopia-core_4.3.3.bb
packages/uicmoc/uicmoc4-native_4.3.2.bb
packages/uicmoc/uicmoc4-native_4.3.3.bb
packages/qt4
packages/qmake/qmake2-native/qt-config.patch
packages/qt4/qt4-x11-free.inc
packages/qt4/qt_configuration.inc
packages/qt4/qt_depends.inc
packages/qt4/qt_packaging.inc
packages/qt4/qt_staging.inc
packages/qt4/qtopia-core.inc
classes/qmake2.bbclass
classes/qtopia4core.bbclass
classes/xilinx-bsp.bbclass
conf/checksums.ini
packages/busybox/busybox_1.00.bb
packages/gallery/gallery_1.5.5.bb
packages/glibc/eglibc-package.bbclass
packages/glibc/glibc-package.bbclass
packages/linux/linux-dht-walnut_2.6.20.bb
packages/linux/linux-efika_2.6.20.20.bb
packages/linux/linux-efika_2.6.20.bb
packages/linux/linux-efika_2.6.21+git.bb
packages/linux/linux-magicbox_2.6.18.6.bb
packages/linux/linux-magicbox_2.6.19.2.bb
packages/linux/linux-ml403-mvista-2.6.x_git.bb
packages/linux/linux-ml403-slab-2.6.x_git.bb
packages/linux/linux-sequoia_2.6.21.bb
packages/meta/external-toolchain.bb
packages/openmoko2/openmoko-sample2_svn.bb
packages/uicmoc/uicmoc4-native.inc
Diffs:
#
# mt diff -r909c536d732a709ac1bbe82a546de7dade5fdf07 -rc70e0edf55d8daad66cd664301fbfc27f2386625
#
#
#
# delete "packages/poppler/poppler0.6_cvs.bb"
#
# delete "packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch"
#
# rename "packages/apex/files"
# to "packages/apex/apex-nslu2-1.5.8"
#
# rename "packages/apex/files/defconfig-16mb"
# to "packages/apex/apex-nslu2-16mb-1.5.8/defconfig"
#
# rename "packages/apex/files/find-apex-partition.patch"
# to "packages/apex/files/find-apex-partition.patch"
#
# rename "packages/navit/navit_cvs.bb"
# to "packages/navit/navit_0.0.3.bb"
#
# rename "packages/roadmap/files/qt/roadmap.desktop.patch"
# to "packages/roadmap/files/roadmap.desktop.patch"
#
# rename "packages/roadmap/roadmap-gtk2_cvs.bb"
# to "packages/roadmap/roadmap-gtk2_1.1.0.bb"
#
# add_dir "contrib/deploy"
#
# add_dir "contrib/deploy/nfs"
#
# add_dir "packages/apex/apex-nslu2-1.5.13"
#
# add_dir "packages/apex/apex-nslu2-16mb-1.5.13"
#
# add_dir "packages/apex/apex-nslu2-16mb-1.5.8"
#
# add_dir "packages/apex/files"
#
# add_dir "packages/matchbox-applet-startup-monitor/files"
#
# add_dir "packages/roadmap/roadmap-gtk2-1.0.12"
#
# add_file "contrib/deploy/README"
# content [c3e0e9da6387c961d18461e22de7556a94a37a5e]
#
# add_file "contrib/deploy/nfs/exports.sample"
# content [873dee0855ece7add89696fa1203572e28671d9d]
#
# add_file "contrib/deploy/nfs/oe-nfs-deploy-image"
# content [892fee86f3f7fb512be7dd5114da05f12e1585eb]
#
# add_file "packages/apex/apex-env_1.5.13.bb"
# content [359fb1dbc4e89bd1fa66fbbfdb2b96f46db67097]
#
# add_file "packages/apex/apex-nslu2-1.5.13/defconfig"
# content [6b49cd1b3da1a840b1f89d8a85bb5b8491c2bcc6]
#
# add_file "packages/apex/apex-nslu2-16mb-1.5.13/defconfig"
# content [23f6924d48366d8ea59a0b5e04f3faf94d40ae81]
#
# add_file "packages/apex/apex-nslu2-16mb_1.5.13.bb"
# content [7a4d7e6091f47208b9adf22030c27c139f7c7497]
#
# add_file "packages/apex/apex-nslu2_1.5.13.bb"
# content [75c8fa6cede30d5a2029f4988edf53a08d73ae6a]
#
# add_file "packages/matchbox-applet-startup-monitor/files/mb-applet-startup-monitor.desktop"
# content [382b7a2e780a9ce43b13aceaac3dce873360c143]
#
# add_file "packages/navit/navit.inc"
# content [926adcffc6471b5c8bf96d43d6eaf5c81bd2debf]
#
# add_file "packages/navit/navit_cvs.bb"
# content [df4f34394db1e519bb35df38f60d90b0c1a13b71]
#
# add_file "packages/octave/octave_3.0.0.bb"
# content [fd814dd8dc7d4aed94aeda8148c85861039e1b40]
#
# add_file "packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch"
# content [72a4e83be42ae269c1a94a7d4b9bfcec143dc775]
#
# add_file "packages/roadmap/roadmap-gtk2_1.0.12.bb"
# content [5c5317b0388798186c0b355406eac18c0fc2ed8b]
#
# add_file "packages/roadmap/roadmap-gtk2_cvs.bb"
# content [511a10a8453ed27a0df812a48cdcba14f90788e9]
#
# add_file "packages/slugos-init/slugos-init_4.8.bb"
# content [2343c97474f1173c4de03888133aaca41007bb13]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.3.0.0/tosa-fbdev.patch"
# content [873e511cd3661d256ac9429fd1f8fa41977e8ca7]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [b7a6011068cdb0aca1822ed845471e128801c559]
# to [782e80b0f3b3076866c7a3507276ad9f24f91bc4]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [2210b55702af66bd7496230c31bdd3b1434c3ef5]
# to [cfb2470633befb35503cc4ec17fdc9cf0aa0e3f3]
#
# patch "conf/distro/include/slugos.inc"
# from [690d94b2c48241bfbeb7f7425c4304d7a0a5160c]
# to [33a45c83269ec4af99a3349a9aa818e1e1afba35]
#
# patch "contrib/angstrom/build-feeds.sh"
# from [e970609068ec55dfd2d83caf4f29f6981ac2defe]
# to [f2e6a1786dbaa0c8dcb6aa072b2a04d094b8103c]
#
# patch "contrib/angstrom/build-release.sh"
# from [9d5f537d764ff8ed751baf7c1ba2d41b8829d875]
# to [4b487748d08b4825735633a40285fee332e77b98]
#
# patch "packages/angstrom/angstrom-gpe-task-base.bb"
# from [93d648076841f25d763321ea213968e31aac2624]
# to [dd9368bd4438ecd0ade41027af984fe2ba55ae15]
#
# patch "packages/apex/apex-nslu2-16mb_1.5.8.bb"
# from [c02440190f04b67f86510889b698f2accce6e9e3]
# to [1830c4d49ad8f2f0cb6657b21e15a1af14c0c1bd]
#
# patch "packages/bluez/bluez-utils/hciattach-ti-bts.patch"
# from [1d4e3c1718d18414e477efcb65a77b37de1616cb]
# to [2325160feaae636c3e834dcf0b73984945c0899f]
#
# patch "packages/bluez/bluez-utils3.inc"
# from [57a5ef74c55de81a92629f96194e3390e75484af]
# to [4e06e74f7b9a84e626e018ff0d2e9969bdd5ac67]
#
# patch "packages/bluez/bluez-utils_3.23.bb"
# from [585b498ec4a54ca79531aca3aabb3569a3dd6476]
# to [e19b966dd298ba92c4980f3df32211c2eeffc8f1]
#
# patch "packages/images/base-image.bb"
# from [a1e5aad1ac0a18575912aad884dfdc89508d7d46]
# to [9c81aebd2963f50d6b9de4476bda3726a21b502b]
#
# patch "packages/images/minimal-gpe-image.bb"
# from [a0dd38c53ff0c3542cb4fb56d015979b65935ee1]
# to [b6ec94cbbd30d656387b5fc96133954bd84abaaa]
#
# patch "packages/images/nas-server-image.bb"
# from [4a3d731bbbd71dc410b89cd730fedb91cfa12035]
# to [560048e8fa92ea93876cac92e66f0d4241079ad6]
#
# patch "packages/initrdscripts/files/30-bootmenu.sh"
# from [f75b0281709f790d2341265a880b463f53e674d2]
# to [4b9e167d681b0021650afe5f3dadac184ba2a50b]
#
# patch "packages/initrdscripts/files/80-nfsboot.sh"
# from [cc74b5caa9ab77aa37036dc350e5b6aea94c0f7a]
# to [39f80c590619af300f8d8d8ca20163e696365e97]
#
# patch "packages/initrdscripts/initramfs-module-bootmenu_1.0.bb"
# from [388ec458d592dce0a5a48e2ae5cc23b52f898460]
# to [d4ac079860c7ff288110f5543bbff07217a7c618]
#
# patch "packages/initrdscripts/initramfs-module-nfs_1.0.bb"
# from [a46327b66f6eefb73d7e3e8e77a789f623b67d4f]
# to [6b5e02292ff06a31c6389447680f654c86222185]
#
# patch "packages/kismet/kismet_2007-10-R1.bb"
# from [cb2ebd02b717a445eea7d52c0967752bad90862a]
# to [b8971fcf7ccf5f139688680c6faccc7b2cfe9bff]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig"
# from [c986d1a87b8fa694e045a150e5c8b3f104bb912d]
# to [76891143854d372bc43f3d21ed45c85da69f1567]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig"
# from [c2c9b620fd8246b79cf6fc9a248a93d13926b09b]
# to [2128159bb4cdbdeca01b509906ff1821c877a129]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig"
# from [3eab7d807a91664c39d9797521f5e001eb532dc1]
# to [3645630f9561142e01f5737dd7ff18edfef6c006]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig"
# from [d9f8a03872694e2c0be6681f854850597378c1ae]
# to [c529e21cb72265a7f14c1656f55958f8ee1a29cb]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig"
# from [e91cf692230fcbdd091ac4f03bd76d0a90f4d76d]
# to [043a7bfdc9b878696a9b605e42e1ba4f998d07e2]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig"
# from [8516de814611730a6b8838cd1e514bfc74949359]
# to [04a759fec9a7aa4a02cdb66576eda277cfabf95d]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig"
# from [b38e2b0e42d029892edfbdd98314146994a3fd95]
# to [e07515d0c8d4515efdafdd7fb31902e31bfb3d18]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig"
# from [584d8e5084b8a6299e7ccec18f2ca07bddb5a2b2]
# to [f26b513a7d0e8c9d9fd622ae177feb6e32673cc5]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig"
# from [d4532b4e939e3d7de2b696337dbc347880be34e4]
# to [97f42f0d579648d4302d0c874ee773c693ad65b9]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig"
# from [a11092b9b193dec862b1bdf2619df7c3b2dd7074]
# to [0bba7e61869a6ae97b5ccd701d65ff14ae3a9b54]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig"
# from [bbd3533d10c6c745448c5e92c3799fb591b10dc0]
# to [1f44ce3b10f1bd67d5c03a4f43b7ae17079ece4a]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig"
# from [916c7fb59ffee9d08c8eea9927fb2f5087fe3bed]
# to [07f6e4fd603a0f016fd81fe275d96aa215c9f0d9]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig"
# from [928f2aee6999e7fb23171cb5d087888c4378daa2]
# to [c8b5d3a6d0813982e97456536babeded66c9be9a]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig"
# from [2c150fb9e8042a7b8f19d820d120b42df5744f45]
# to [dcdb52fed1629f3d21f60cf632771733a1b7cbf8]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig"
# from [4be5cf341de440a0b942bfbab818e10554d0f2eb]
# to [249212289907b0b2c767e96fc2348ff0110b544a]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig"
# from [02d4621765d3dc9cbfedebf028cb011d88a63c5d]
# to [723012632f45e919355f11298b407e5a3bfc9414]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig"
# from [cfc4330f5746e2b1c98989d3fdbfea4800fb7667]
# to [9ab14f9856411e299318cc0af3af2fdddcce0adf]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig"
# from [1102b410bd3d8153c18f41afde3028d699c7d85f]
# to [9849870d178cbec82b42dd11887d18983aebc621]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig"
# from [d7e0bd9a6211fe5fefee01e67b04e6bf6356f45a]
# to [aaced1cf33f6cace5b4af751c55563e3dc2d9c3f]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig"
# from [f228f1ef12b6ad82b61392c2ea58bf1a534bf43c]
# to [e8ea2896bac28c86e2aef1c88a1242b49176e046]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig"
# from [f7e08d2a55df3845c408e8966ff07f2aa83bd5b7]
# to [3e4b2c099ccb612604c0a63cfd03767275151fa2]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig"
# from [89afc38bbd5dfffdce8dc5baa7471f4648de4b87]
# to [1a117da2e29a70c61b56cad21ab2190b388f6741]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig"
# from [ccae20c3f62e40debe77a7fbe0a1c9cf01b17fb1]
# to [b6050360c01b5aa7fb17333fffd77a84c625ced0]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig"
# from [941f436760a2e74c042122f4fd22e0da0880480c]
# to [5dde3f96278f98cb135faa9f5d25fa0995fa5a00]
#
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb"
# from [f6bafabbd68cd660896b99cd7c0e97e772393a05]
# to [0a244bcf5bda358a1953e20a41fc43ee5ba66736]
#
# patch "packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch"
# from [0c5154e470f4e55e2a4fad1e3ff7765a939dc651]
# to [b87e8646dadfb7d5d16757a725aaef9cbc7b7778]
#
# patch "packages/linux/linux-rp_2.6.23.bb"
# from [505c9cf9c63acfb81b9eb656abe42b25f2e89794]
# to [80ed60c8b799a23d2c149a04bbf24f1ed3353a2a]
#
# patch "packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb"
# from [9386fdf6b6c903f2aa72404a299c3bb46c509077]
# to [95bda50aee7f6cc989efdd0e23a4546ed5a99d22]
#
# patch "packages/navit/navit_0.0.1.bb"
# from [f26539d3ae16efb9541db714be3d65c0312fc4a8]
# to [e62a0cfbc62cafa0aeb28e5404dda21160b96d70]
#
# patch "packages/navit/navit_0.0.2.bb"
# from [8189c9268a53e80bff74928adc510bd38c8de9b2]
# to [2942d2b0d378026c3e523ebe3834c3aafa8a1e9d]
#
# patch "packages/navit/navit_0.0.3.bb"
# from [bc906c7a1120cb9f65cf1e357eaacd23ff8e0df9]
# to [889d14a50f20feacdb3bfe544505a50b469248d1]
#
# patch "packages/python/python-pyqt_4.3.3.bb"
# from [f4e8b4a75b9b494f6d70e74cc041955ee3af4996]
# to [4c9dd6dd767d79bb118e973d47bbda095cc45c6f]
#
# patch "packages/roadmap/roadmap-gtk2_1.1.0.bb"
# from [3d494fe1e57842d791e68ad3ac1b63b1692305d6]
# to [2c80d0c130f7c15041a33dfcbc36486ffb5c6a6d]
#
# patch "packages/roadmap/roadmap.inc"
# from [18f16cbe822cba5f8dd391e023297f98a693d254]
# to [e3d443eff17119798c0c6deda17bf6ff8785c257]
#
# patch "packages/roadmap/zroadmap_1.0.12.bb"
# from [defdf4312079c65d41c8d23a255e656af962c476]
# to [c6606e496ddb94bd587b0dc254064d721c276aac]
#
# patch "packages/roadmap/zroadmap_1.1.0.bb"
# from [47050a07f10a909f16525fb375ad0bff60a3822e]
# to [deaa33e33e25e1c9b13a64473c53715a50f05d59]
#
# patch "packages/roadmap/zroadmap_cvs.bb"
# from [a3e925537e5fc4d227e62224726e06d610c448b3]
# to [910020856a214de2ce5b21692e857806378508b4]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb"
# from [f9825c85f0e52ef579e9bef9ad5f2469dae32694]
# to [58d9f93157413d0ca323b5aeb9132e14c6bf0210]
#
# patch "packages/zaurus-updater/zaurus-updater/updater.sh"
# from [3414afa63a3d12e6a4cd900e882c8a621de05e1a]
# to [1bed21da6a3b2f4de965a06c2b32af9c3829ea42]
#
# patch "packages/zaurus-updater/zaurus-updater.bb"
# from [f8f7bbf562514bec8076212836576397889ee6ed]
# to [6e0132a319145e0bee0939723f38518cc48760b8]
#
# set "contrib/deploy/nfs/oe-nfs-deploy-image"
# attr "mtn:execute"
# value "true"
#
============================================================
--- contrib/deploy/README c3e0e9da6387c961d18461e22de7556a94a37a5e
+++ contrib/deploy/README c3e0e9da6387c961d18461e22de7556a94a37a5e
@@ -0,0 +1,2 @@
+This directory contains script for deploying OE-generated images for various
+devices and boot methods.
============================================================
--- contrib/deploy/nfs/exports.sample 873dee0855ece7add89696fa1203572e28671d9d
+++ contrib/deploy/nfs/exports.sample 873dee0855ece7add89696fa1203572e28671d9d
@@ -0,0 +1,2 @@
+# /etc/exports: NFS file systems being exported. See exports(5).
+/srv/nfs/oe 192.168.0.0/16(rw,insecure,no_root_squash)
============================================================
--- contrib/deploy/nfs/oe-nfs-deploy-image 892fee86f3f7fb512be7dd5114da05f12e1585eb
+++ contrib/deploy/nfs/oe-nfs-deploy-image 892fee86f3f7fb512be7dd5114da05f12e1585eb
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+# Wonder what the heck is /srv ? Read Filesystem Hierarchy Standard,
+# http://www.pathname.com/fhs/pub/fhs-2.3.html#SRVDATAFORSERVICESPROVIDEDBYSYSTEM
+# So, /srv/nfs is root of all NFS exports your system offers, and /srv/nfs/oe is
+# OpenEmbedded's subset (think security).
+NFS_ROOT=/srv/nfs/oe
+
+if [ -z "$1" ]; then
+ echo "$0 - Deploy OpenEmbedded-generated image for device NFS boot"
+ echo "Usage: $0 <image> | -l"
+ exit
+fi
+
+if [ "$1" == "-l" ]; then
+ if [ -n "$2" ]; then
+ extra="-name *$2*"
+ fi
+ find tmp/deploy/ -regextype posix-extended -wholename '*/images/*' -regex '.+\.(tar\.bz2|tar\.gz|cpio\.gz)$' $extra | xargs ls -l
+ exit
+fi
+
+if [ ! -f $1 ]; then
+ echo "Cannot find image $1"
+ exit
+fi
+
+ext=`echo $1 | sed -r -e 's/.+\.([^.]+\.[^.]+)/\1/'`
+basename=`basename $1 .$ext`
+
+if [ -z "$basename" ]; then
+ echo "Assertion failed"
+ exit 100
+fi
+
+echo "Deploying to: $NFS_ROOT/$basename"
+
+rm -rf $NFS_ROOT/$basename
+
+mkdir -p $NFS_ROOT/$basename
+
+if [ "$ext" == "tar.bz2" ]; then
+ tar -xj -f $1 -C $NFS_ROOT/$basename
+elif [ "$ext" == "tar.gz" ]; then
+ tar -xz -f $1 -C $NFS_ROOT/$basename
+else
+ FPATH=`pwd`
+ cd $NFS_ROOT/$basename
+ bash -c "gzip -d -c $FPATH/$1 | cpio -i --no-absolute-filenames"
+ cd $FPATH
+fi
============================================================
--- packages/apex/apex-env_1.5.13.bb 359fb1dbc4e89bd1fa66fbbfdb2b96f46db67097
+++ packages/apex/apex-env_1.5.13.bb 359fb1dbc4e89bd1fa66fbbfdb2b96f46db67097
@@ -0,0 +1,24 @@
+DESCRIPTION = "APEX Boot Loader Environment User Modification Tool"
+SECTION = "util"
+PRIORITY = "optional"
+HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
+ file://find-apex-partition.patch;patch=1 \
+ "
+S = ${WORKDIR}/apex-${PV}/usr
+
+EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
+
+oe_runmake() {
+ oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@"
+ make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed"
+}
+
+do_install() {
+ ${STRIP} ${S}/apex-env
+ install -d ${D}/${sbindir}
+ install -m 755 ${S}/apex-env ${D}/${sbindir}
+}
============================================================
--- packages/apex/apex-nslu2-1.5.13/defconfig 6b49cd1b3da1a840b1f89d8a85bb5b8491c2bcc6
+++ packages/apex/apex-nslu2-1.5.13/defconfig 6b49cd1b3da1a840b1f89d8a85bb5b8491c2bcc6
@@ -0,0 +1,164 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version:
+# Mon Dec 24 14:54:47 2007
+#
+CONFIG_ARM=y
+CONFIG_CPU_ARMV5=y
+CONFIG_CPU_XSCALE=y
+# CONFIG_ARCH_LH7952X is not set
+# CONFIG_ARCH_LH7A40X is not set
+CONFIG_ARCH_IXP42X=y
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_MX3 is not set
+%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rdafddd1d044d96ecf2e968c17c56e4f9f332240d -rc70e0edf55d8daad66cd664301fbfc27f2386625
#
#
#
# rename "packages/qmake/qmake2-native-2.10a"
# to "packages/qmake/qmake2-native"
#
# rename "packages/qmake/qmake2-native_2.10a.bb"
# to "packages/qmake/qmake2-native.inc"
#
# rename "packages/qt/qt4-x11-free-4.1.2"
# to "packages/qt4/qt4-x11-free-4.1.2"
#
# rename "packages/qt/qt4-x11-free-4.3.2"
# to "packages/qt4/qt4-x11-free-4.3.3"
#
# rename "packages/qt/qt4-x11-free_4.1.2.bb"
# to "packages/qt4/qt4-x11-free_4.1.2.bb"
#
# rename "packages/qt/qt4-x11-free_4.3.2.bb"
# to "packages/qt4/qt4-x11-free_4.3.3.bb"
#
# rename "packages/qt/qt4_arch.inc"
# to "packages/qt4/qt4_arch.inc"
#
# rename "packages/qte/qtopia-core"
# to "packages/qt4/qtopia-core"
#
# rename "packages/qte/qtopia-core_4.2.0.bb"
# to "packages/qt4/qtopia-core_4.2.0.bb"
#
# rename "packages/qte/qtopia-core_4.3.2.bb"
# to "packages/qt4/qtopia-core_4.3.3.bb"
#
# rename "packages/uicmoc/uicmoc4-native_4.3.2.bb"
# to "packages/uicmoc/uicmoc4-native_4.3.3.bb"
#
# add_dir "packages/qt4"
#
# add_file "packages/qmake/qmake2-native/qt-config.patch"
# content [ffca4aa5d3ae8c6e3e9c1d699382d3079a770c7c]
#
# add_file "packages/qmake/qmake2-native_2.10a.bb"
# content [87d12872c36ccf6797ad38776a929652d95a4850]
#
# add_file "packages/qt4/qt4-x11-free.inc"
# content [e036ae34d1fabdd344679ade9c3d17c89e77645a]
#
# add_file "packages/qt4/qt_configuration.inc"
# content [5abde732116982782ed3a94ede56bf274012fc1f]
#
# add_file "packages/qt4/qt_depends.inc"
# content [2fd4202201d2ae2c8c52f8b9c4ac142e55516259]
#
# add_file "packages/qt4/qt_packaging.inc"
# content [4724721053882c0a600abf701a2210c4d55f880e]
#
# add_file "packages/qt4/qt_staging.inc"
# content [29e47cc09119f562a481e833d78686b7dbe5ae42]
#
# add_file "packages/qt4/qtopia-core.inc"
# content [43362ed93891f96b27e12fea9a81198cc5d99b6d]
#
# patch "classes/qmake2.bbclass"
# from [4720a6ca5e41a1786e98f6876c83791801e04a1a]
# to [e469f74476f5cd684b559146bbd4e808de9dcadb]
#
# patch "classes/qtopia4core.bbclass"
# from [f05bb12d7e6296c2ea9e9656a44b1c93f5f0cf21]
# to [b0b03ec4a695417498226c93ffaad9e3981c78fa]
#
# patch "classes/xilinx-bsp.bbclass"
# from [1c5ead4afe4f57431d3f3a5a8c80bdaf34afa9b8]
# to [e8c7ed63687307cb104b234a6c0f4b060974c982]
#
# patch "conf/checksums.ini"
# from [ce22da057e8b56ac8825b7a043b4fa7cc3f86027]
# to [8b808b2bc16a048f0af0417d52948e7da22f97ca]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [d7c8eafeaf5307c4c7714a1560e880c30c9dec32]
# to [782e80b0f3b3076866c7a3507276ad9f24f91bc4]
#
# patch "packages/busybox/busybox_1.00.bb"
# from [a4331e926e10003bf120d6d761b2d94e554c6ab9]
# to [cbf5fd6adad4719d56db281aafea88d874e63772]
#
# patch "packages/gallery/gallery_1.5.5.bb"
# from [08012e9bbaba0586c7721ce8bf77b816de83ebd2]
# to [733e15213ab5e6ec1bd791438af67af63d5ec35c]
#
# patch "packages/glibc/eglibc-package.bbclass"
# from [8f51cdb2c68ef10a8cc444bb9c80b76e1b529a8e]
# to [707f3f7fec8dba48bff09a80fe93f4d753d0ae20]
#
# patch "packages/glibc/glibc-package.bbclass"
# from [87de7a00ded18ae91f844d05b3fb78dd64e0fd7b]
# to [f4791b3fa7f4d093f75d3e760b405eca7feae357]
#
# patch "packages/linux/linux-dht-walnut_2.6.20.bb"
# from [62bdf8a25e2c69fa6d78f11a236567cc8e3205ea]
# to [0c179ddf00c01ed7abb520e96d914fffa789a83b]
#
# patch "packages/linux/linux-efika_2.6.20.20.bb"
# from [02bf23057848f530f4bb9b387634af8ca51c55f3]
# to [01117a66cc290abe28c789551dafbdaadaf2e6df]
#
# patch "packages/linux/linux-efika_2.6.20.bb"
# from [3d646a13d61ed36e48613a5d62ae4c153c42616e]
# to [26eb3e8b2f654dac6975e04c0e7c078417623da6]
#
# patch "packages/linux/linux-efika_2.6.21+git.bb"
# from [b07652616db0ca693ab942e5d21576b84f04e3e9]
# to [1d96763c1bba903c9753ae5d85530485bea1668d]
#
# patch "packages/linux/linux-magicbox_2.6.18.6.bb"
# from [2863c6191e6edd688014663327d3b35bfd47e9ea]
# to [9929bed5a862613d7d6d47cab1dbbed6605b127d]
#
# patch "packages/linux/linux-magicbox_2.6.19.2.bb"
# from [b03c2ca7543c5914973b54ef5b3ea159fbef77ed]
# to [f40feb36483f15f528a68ff787da7d1a1dc83f38]
#
# patch "packages/linux/linux-ml403-mvista-2.6.x_git.bb"
# from [607a3ec1212c49a8bec07ab6a9220e1868f31e6d]
# to [1627e847f526fa7073747ec037b61f626f96352f]
#
# patch "packages/linux/linux-ml403-slab-2.6.x_git.bb"
# from [9199fb7885a068659ab66b6897c7dcf1f94cf3c4]
# to [5030af659ba81e0fd39cabcfe458111ae1646763]
#
# patch "packages/linux/linux-sequoia_2.6.21.bb"
# from [91ba088cf6b7afc424eda939be7afb1dd6223594]
# to [5dc8ca7fe3e92accabff7e6dc3d9d28540f8839b]
#
# patch "packages/meta/external-toolchain.bb"
# from [32574844f3d4c4554cb6e4193123ab1c001b9046]
# to [dcaf40be62789b278a8bcf32b7d1a80010487c6a]
#
# patch "packages/openmoko2/openmoko-sample2_svn.bb"
# from [8dfb2ad71843cf6a80cb46f17623565dbd5a95fa]
# to [f81b348bfe4ffd0c3a27b9c3042e6e2945ea3971]
#
# patch "packages/qmake/qmake2-native.inc"
# from [d941635b01c58764ba76d411ea57f1b33b4d22eb]
# to [d58b0ef825d0f6d7d1a0103da1b2ec0e903de4b2]
#
# patch "packages/qt4/qt4-x11-free_4.3.3.bb"
# from [b7e59e0489502bdfca8e0b0220da5df284fb0995]
# to [cc8872a380445d2c8344bc46ac50b6ba36513594]
#
# patch "packages/qt4/qt4_arch.inc"
# from [43091f9af06d057e17db4730361caf8d5fc177c6]
# to [66bd102114f50fe3120367af2f65157b737db929]
#
# patch "packages/qt4/qtopia-core_4.2.0.bb"
# from [003bf319b5866af6b727725457754c7f73345f6d]
# to [36b4cc98d0151feaf001a4f9c673771698efee04]
#
# patch "packages/qt4/qtopia-core_4.3.3.bb"
# from [132f2ff144e5483dcf628cf56459ce7b81f52b0f]
# to [d4c7ad00be94df45470607e15d0af953b69f996b]
#
# patch "packages/uicmoc/uicmoc4-native.inc"
# from [00e140a2db2c4a7280faaacf41cf19e10afd1b52]
# to [6886688b3df896b25e7d22c296b444e6c7704bd2]
#
============================================================
--- packages/qmake/qmake2-native/qt-config.patch ffca4aa5d3ae8c6e3e9c1d699382d3079a770c7c
+++ packages/qmake/qmake2-native/qt-config.patch ffca4aa5d3ae8c6e3e9c1d699382d3079a770c7c
@@ -0,0 +1,27 @@
+Allow to set a qt.conf from the outside using the environment. This allows
+to inject new prefixes and other paths into qmake. This is needed when using
+the same qmake binary to build qt/x11 and qt/embedded
+
+Index: qtopia-core-opensource-src-4.3.3/src/corelib/global/qlibraryinfo.cpp
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/src/corelib/global/qlibraryinfo.cpp 2007-12-25 00:55:32.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/src/corelib/global/qlibraryinfo.cpp 2007-12-25 01:20:18.000000000 +0100
+@@ -42,6 +42,7 @@
+ #include "qpointer.h"
+ #ifdef QT_BUILD_QMAKE
+ extern QString qmake_libraryInfoFile();
++#include <stdlib.h>
+ #else
+ # include "qcoreapplication.h"
+ #endif
+@@ -107,6 +108,10 @@
+ #ifdef QT_BUILD_QMAKE
+ if(!QFile::exists(qtconfig))
+ qtconfig = qmake_libraryInfoFile();
++ if (!QFile::exists(qtconfig)) {
++ QByteArray config = getenv("QT_CONF_PATH");
++ qtconfig = config;
++ }
+ #else
+ if (!QFile::exists(qtconfig) && QCoreApplication::instance()) {
+ #ifdef Q_OS_MAC
============================================================
--- packages/qmake/qmake2-native_2.10a.bb 87d12872c36ccf6797ad38776a929652d95a4850
+++ packages/qmake/qmake2-native_2.10a.bb 87d12872c36ccf6797ad38776a929652d95a4850
@@ -0,0 +1,2 @@
+QTVERSION="4.3.3"
+require ${PN}.inc
============================================================
--- packages/qt4/qt4-x11-free.inc e036ae34d1fabdd344679ade9c3d17c89e77645a
+++ packages/qt4/qt4-x11-free.inc e036ae34d1fabdd344679ade9c3d17c89e77645a
@@ -0,0 +1,28 @@
+DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.trolltech.com"
+LICENSE = "GPL QPL"
+DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor"
+PROVIDES = "qt4x11"
+PR = "r6"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
+ file://0001-cross-compile.patch;patch=1 \
+ file://0003-no-tools.patch;patch=1 \
+ file://0004-no-qmake.patch;patch=1 \
+ file://0005-fix-mkspecs.patch;patch=1"
+S = "${WORKDIR}/qt-x11-opensource-src-${PV}"
+
+
+QT_CONFIG_FLAGS += "-no-xinerama -no-tablet -no-xkb -no-opengl"
+QT_BASE_NAME = "qt4"
+QT_BASE_LIB = "libqt"
+QT_LIBRARY_NAME = "Qt"
+QT_DIR_NAME = "qt4"
+require qt_depends.inc
+require qt_configuration.inc
+require qt_packaging.inc
+require qt_staging.inc
+
+inherit qt4x11
============================================================
--- packages/qt4/qt_configuration.inc 5abde732116982782ed3a94ede56bf274012fc1f
+++ packages/qt4/qt_configuration.inc 5abde732116982782ed3a94ede56bf274012fc1f
@@ -0,0 +1,82 @@
+require qt4_arch.inc
+QT_ARCH := "${@qt_arch(d)}"
+QT_ENDIAN = "${@qt_endian(d)}"
+
+QT_CONFIG_FLAGS = "-release -no-cups -no-accessibility -reduce-relocations \
+ -shared -no-nas-sound -no-sm -no-nis \
+ -qt-gif -system-libjpeg -system-libpng -system-zlib \
+ -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \
+ -no-pch -qdbus -stl -glib"
+
+EXTRA_OEMAKE = "-e"
+
+EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after \
+ INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
+ QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
+ AR="${TARGET_PREFIX}ar cqs" \
+ MOC="${STAGING_BINDIR_NATIVE}/moc4" UIC="${STAGING_BINDIR_NATIVE}/uic4" MAKE="make -e"'
+
+export QT_CONF_PATH="${WORKDIR}/qt.conf"
+
+do_configure() {
+ unset QMAKESPEC
+ unset QTDIR
+ ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
+ ln -s linux-g++ mkspecs/${TARGET_OS}-oe-g++
+
+ echo "[Paths]" > $QT_CONF_PATH
+ echo "Prefix=${prefix}" >> $QT_CONF_PATH
+ echo "Documentation=${docdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
+ echo "Headers=${includedir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
+ echo "Libraries=${libdir}" >> $QT_CONF_PATH
+ echo "Binaries=${bindir}" >> $QT_CONF_PATH
+ echo "Plugins=${libdir}/${QT_DIR_NAME}/plugins" >> $QT_CONF_PATH
+ echo "Data=${datadir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
+ echo "Translations=${datadir}/${QT_DIR_NAME}/translations" >> $QT_CONF_PATH
+ echo "Settings=${sysconfdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
+ echo "Examples=${bindir}/${QT_DIR_NAME}/examples" >> $QT_CONF_PATH
+ echo "Demos=${bindir}/${QT_DIR_NAME}/demos" >> $QT_CONF_PATH
+
+ echo yes | ./configure -v \
+ -prefix ${prefix} \
+ -bindir ${bindir} \
+ -libdir ${libdir} \
+ -datadir ${datadir}/${QT_DIR_NAME} \
+ -sysconfdir ${sysconfdir}/${QT_DIR_NAME} \
+ -docdir ${docdir}/${QT_DIR_NAME} \
+ -headerdir ${includedir}/${QT_DIR_NAME} \
+ -plugindir ${libdir}/${QT_DIR_NAME}/plugins \
+ -translationdir ${datadir}/${QT_DIR_NAME}/translations \
+ -examplesdir ${bindir}/${QT_DIR_NAME}/examples \
+ -demosdir ${bindir}/${QT_DIR_NAME}/demos \
+ -platform ${TARGET_OS}-oe-g++ \
+ -xplatform ${TARGET_OS}-oe-g++ \
+ -embedded ${QT_ARCH} ${QT_ENDIAN} -fast \
+ -crossarch ${QT_ARCH} \
+ ${QT_CONFIG_FLAGS} -fast \
+ -L${STAGING_LIBDIR} -I${STAGING_INCDIR} \
+ -I${STAGING_INCDIR}/freetype2
+}
+
+do_compile() {
+ unset CFLAGS CXXFLAGS
+ install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
+ install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
+ install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
+
+ oe_runmake ${EXTRA_ENV}
+}
+
+#
+# Fixup some pkgconfig files
+# moc_location=/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/bin/moc
+# uic_location=/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/bin/uic
+#
+# Libs: -L${libdir} -lQtNetwork -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/staging/arm-angstrom-linux/lib -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/lib $(LIBS_EXTRA) -lQtCore -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/staging/arm-angstrom-linux/lib -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/lib -lm -lrt -lpthread -ldl
+#
+do_compile_append() {
+ cd ${S}/lib/pkgconfig
+ sed -i s#"-L${S}/lib"##g *.pc
+ sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# *.pc
+ sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# *.pc
+}
============================================================
--- packages/qt4/qt_depends.inc 2fd4202201d2ae2c8c52f8b9c4ac142e55516259
+++ packages/qt4/qt_depends.inc 2fd4202201d2ae2c8c52f8b9c4ac142e55516259
@@ -0,0 +1,3 @@
+inherit pkgconfig qmake_base
+
+DEPENDS += " uicmoc4-native qmake2-native freetype jpeg libpng zlib dbus openssl glib-2.0"
============================================================
--- packages/qt4/qt_packaging.inc 4724721053882c0a600abf701a2210c4d55f880e
+++ packages/qt4/qt_packaging.inc 4724721053882c0a600abf701a2210c4d55f880e
@@ -0,0 +1,150 @@
+NONDEV_PACKAGES = "${QT_BASE_LIB}core4 ${QT_BASE_LIB}gui4 ${QT_BASE_LIB}network4 \
+ ${QT_BASE_LIB}sql4 ${QT_BASE_LIB}svg4 ${QT_BASE_LIB}test4 ${QT_BASE_LIB}xml4 \
+ ${QT_BASE_LIB}designer4 ${QT_BASE_LIB}designercomponents4 \
+ ${QT_BASE_LIB}3support4 ${QT_BASE_LIB}assistantclient4 ${QT_BASE_LIB}script4 \
+ ${QT_BASE_LIB}dbus4 ${QT_BASE_LIB}opengl4 \
+ ${QT_BASE_NAME}-assistant ${QT_BASE_NAME}-common \
+ ${QT_BASE_NAME}-designer \
+ ${QT_BASE_NAME}-demos ${QT_BASE_NAME}-examples \
+ ${QT_BASE_NAME}-linguist \
+ ${QT_BASE_NAME}-pixeltool ${QT_BASE_NAME}-dbus \
+ ${QT_BASE_NAME}-plugins-accessible \
+ ${QT_BASE_NAME}-plugins-codecs \
+ ${QT_BASE_NAME}-plugins-designer \
+ ${QT_BASE_NAME}-plugins-imageformats \
+ ${QT_BASE_NAME}-plugins-sqldrivers \
+ ${QT_BASE_NAME}-plugins-inputmethods \
+ ${QT_BASE_NAME}-plugins-iconengines \
+ ${QT_BASE_NAME}-fonts "
+
+DEV_PACKAGES += "${QT_BASE_LIB}core4-dev \
+ ${QT_BASE_LIB}gui4-dev \
+ ${QT_BASE_LIB}network4-dev \
+ ${QT_BASE_LIB}sql4-dev \
+ ${QT_BASE_LIB}svg4-dev \
+ ${QT_BASE_LIB}test4-dev \
+ ${QT_BASE_LIB}xml4-dev \
+ ${QT_BASE_LIB}designer4-dev \
+ ${QT_BASE_LIB}designercomponents4-dev \
+ ${QT_BASE_LIB}3support4-dev \
+ ${QT_BASE_LIB}assistantclient4-dev \
+ ${QT_BASE_LIB}script4-dev \
+ ${QT_BASE_LIB}dbus4-dev \
+ ${QT_BASE_LIB}opengl4-dev \
+ ${QT_BASE_LIB}uitools4-dev"
+
+DBG_PACKAGES += "${QT_BASE_LIB}core4-dbg \
+ ${QT_BASE_LIB}gui4-dbg \
+ ${QT_BASE_LIB}network4-dbg \
+ ${QT_BASE_LIB}sql4-dbg \
+ ${QT_BASE_LIB}svg4-dbg \
+ ${QT_BASE_LIB}test4-dbg \
+ ${QT_BASE_LIB}xml4-dbg \
+ ${QT_BASE_LIB}designer4-dbg \
+ ${QT_BASE_LIB}designercomponents4-dbg \
+ ${QT_BASE_LIB}3support4-dbg \
+ ${QT_BASE_LIB}assistantclient4-dbg \
+ ${QT_BASE_LIB}script4-dbg \
+ ${QT_BASE_LIB}dbus4-dbg \
+ ${QT_BASE_LIB}opengl4-dbg "
+
+
+PACKAGES += "${DEV_PACKAGES} ${NONDEV_PACKAGES} ${DBG_PACKAGES}"
+
+ALLOW_EMPTY_${PN} = "1"
+FILES_${PN} = ""
+FILES_${PN}-dev = " ${includedir}/${QT_DIR_NAME}/Qt/*"
+FILES_${PN}-dbg = "${bindir}/*/.debug ${libdir}/${QT_DIR_NAME}/plugins/*/.debug/*.so"
+RDEPENDS_${PN} = "${NONDEV_PACKAGES}"
+RDEPENDS_${PN}-dev = "${DEV%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list