[oe-commits] org.oe.dev merge of '81c1ca19a24db9495de03956421cdf6ea0ad4e93'

[xora commit]

merge of '81c1ca19a24db9495de03956421cdf6ea0ad4e93'
     and 'd63819fa685c3d0474a7e11368d9dafdbcb3404f'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: b266d00fc6fbbe7f1b67452f019bc173da3eb49d
ViewMTN: http://monotone.openembedded.org/revision/info/b266d00fc6fbbe7f1b67452f019bc173da3eb49d
Files:
1
conf/distro/openmoko.conf
packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch
packages/uboot/files/makefile-no-dirafter.patch
packages/meta/slugos-packages.bb
packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
packages/uicmoc/uicmoc4-native_4.3.1.bb
Diffs:

#
# mt diff -r81c1ca19a24db9495de03956421cdf6ea0ad4e93 -rb266d00fc6fbbe7f1b67452f019bc173da3eb49d
#
# 
# 
# patch "conf/distro/openmoko.conf"
#  from [9e093358b00d1965dc02e8efe6c6716c5e56fb80]
#    to [2ec30f54157022779b502f8ec721dfbf3505d89b]
# 
============================================================
--- conf/distro/openmoko.conf	9e093358b00d1965dc02e8efe6c6716c5e56fb80
+++ conf/distro/openmoko.conf	2ec30f54157022779b502f8ec721dfbf3505d89b
@@ -11,7 +11,7 @@ DISTRO_NAME = "OpenMoko"
 #
 DISTRO = "openmoko"
 DISTRO_NAME = "OpenMoko"
-DISTRO_VERSION = "P1-September-Snapshot-${DATE}"
+DISTRO_VERSION = "P1-Snapshot-${DATE}"
 #DISTRO_TYPE = "release"
 DISTRO_TYPE = "debug"
 


#
# mt diff -rd63819fa685c3d0474a7e11368d9dafdbcb3404f -rb266d00fc6fbbe7f1b67452f019bc173da3eb49d
#
# 
# 
# rename "packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch"
#     to "packages/uboot/files/makefile-no-dirafter.patch"
# 
# patch "packages/meta/slugos-packages.bb"
#  from [f0c762b44a0bab705cdd75211c3ce4fe78b03a3c]
#    to [c7013eacc72de83c038d4af1c8c1b1d6b83413de]
# 
# patch "packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb"
#  from [d3999509e6f8e1b8cbcd12aafad259da103400de]
#    to [0c0171c90503926242288f89cf359ffc1a9f7b2c]
# 
# patch "packages/uicmoc/uicmoc4-native_4.3.1.bb"
#  from [7ac42702123875fa07b391881bfde6f56531dd93]
#    to [83b84a6976c32c4c094913143c9ed28a2b37c610]
# 
============================================================
--- packages/meta/slugos-packages.bb	f0c762b44a0bab705cdd75211c3ce4fe78b03a3c
+++ packages/meta/slugos-packages.bb	c7013eacc72de83c038d4af1c8c1b1d6b83413de
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r39"
+PR = "r40"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2"
@@ -50,6 +50,8 @@ SLUGOS_PACKAGES = "\
 	cron \
 	ctorrent \
 	ctrlproxy \
+	cups \
+	curl \
 	cvs \
 	cyrus-imapd \
 	cyrus-sasl \
============================================================
--- packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb	d3999509e6f8e1b8cbcd12aafad259da103400de
+++ packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb	0c0171c90503926242288f89cf359ffc1a9f7b2c
@@ -19,6 +19,7 @@ SRC_URI = "\
   svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;rev=${UBOOT_OPENMOKO_REV};proto=http \
   file://uboot-eabi-fix-HACK.patch \
   file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
+  file://makefile-no-dirafter.patch;patch=1 \
 "
 
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
============================================================
--- packages/uicmoc/uicmoc4-native_4.3.1.bb	7ac42702123875fa07b391881bfde6f56531dd93
+++ packages/uicmoc/uicmoc4-native_4.3.1.bb	83b84a6976c32c4c094913143c9ed28a2b37c610
@@ -26,6 +26,7 @@ do_configure() {
 EXTRA_OEMAKE = " "
 
 do_configure() {
+	sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro
 	echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
 }