[oe-commits] org.oe.dev merge of '46876c0e449d95a41520ddd3b4b694e1d919dd4b'

[mwester commit]

merge of '46876c0e449d95a41520ddd3b4b694e1d919dd4b'
     and 'afda8aa11a73621c3822525abaf21bc2c4b73ab7'

Author: mwester at openembedded.org
Branch: org.openembedded.dev
Revision: fd6c3104412672124350e987af3ff8736304f817
ViewMTN: http://monotone.openembedded.org/revision/info/fd6c3104412672124350e987af3ff8736304f817
Files:
1
packages/meta/slugos-packages.bb
packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch
packages/uboot/files/makefile-no-dirafter.patch
packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
Diffs:

#
# mt diff -r46876c0e449d95a41520ddd3b4b694e1d919dd4b -rfd6c3104412672124350e987af3ff8736304f817
#
# 
# 
# patch "packages/meta/slugos-packages.bb"
#  from [f0c762b44a0bab705cdd75211c3ce4fe78b03a3c]
#    to [c7013eacc72de83c038d4af1c8c1b1d6b83413de]
# 
============================================================
--- 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 \


#
# mt diff -rafda8aa11a73621c3822525abaf21bc2c4b73ab7 -rfd6c3104412672124350e987af3ff8736304f817
#
# 
# 
# rename "packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch"
#     to "packages/uboot/files/makefile-no-dirafter.patch"
# 
# patch "packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb"
#  from [d3999509e6f8e1b8cbcd12aafad259da103400de]
#    to [0c0171c90503926242288f89cf359ffc1a9f7b2c]
# 
============================================================
--- 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}"