[oe-commits] org.oe.angstrom-2007.12-stable merge of '8e22d58b92d9c2092170c57781ba097dc76c1ed9'

[pfalcon commit]

merge of '8e22d58b92d9c2092170c57781ba097dc76c1ed9'
     and 'bd8408430d3ce62c130d02580b0b03d7c7c50e45'

Author: pfalcon at openembedded.org
Branch: org.openembedded.angstrom-2007.12-stable
Revision: 1531c8535e06770d5e87478e4a8614904f51e409
ViewMTN: http://monotone.openembedded.org/revision/info/1531c8535e06770d5e87478e4a8614904f51e409
Files:
1
BACKPORTS.txt
packages/cups/cups.inc
packages/cups/cups_1.2.10.bb
packages/cups/cups_1.2.12.bb
contrib/angstrom/build-release.sh
Diffs:

#
# mt diff -r8e22d58b92d9c2092170c57781ba097dc76c1ed9 -r1531c8535e06770d5e87478e4a8614904f51e409
#
# 
# 
# patch "BACKPORTS.txt"
#  from [aec4f8d4d42cdb352f10eedc3534b242e2fe571d]
#    to [04fa9daa5c7fce65aec29d85db37a01e1157b3fb]
# 
# patch "packages/cups/cups.inc"
#  from [222ec9d8aeac6ec4e9ebcaaaa920915c43052b25]
#    to [08e5210923c3872e4467981f0a7aaa9738a57165]
# 
# patch "packages/cups/cups_1.2.10.bb"
#  from [61eb68a7e7eb38c6af4139bae6ef7c9be81c5acf]
#    to [e2406d561f2df9078da93d2a26c2ebd15e78b078]
# 
# patch "packages/cups/cups_1.2.12.bb"
#  from [dc5d10665104ca7d5faa51dabb605e562691f6e9]
#    to [8edcc03e28f79076b582dc309d6a7690e3901663]
# 
============================================================
--- BACKPORTS.txt	aec4f8d4d42cdb352f10eedc3534b242e2fe571d
+++ BACKPORTS.txt	04fa9daa5c7fce65aec29d85db37a01e1157b3fb
@@ -14,7 +14,6 @@
 c6fac7ea20ca568a16a2b76aae0eb280f2faf7a3   "
 4f0260db452e1d17accce2d4d5bdb2c928659a73 h5000.conf: Ship kernel-module-i2c-pxa. (Koen)
 647847c7187d536c71adab58568757d34b048ac2 h5000.conf: Ship BT module. (Koen)
-02945aaeb0e67e273a58bf42b1a0a7988a413f92 cups tweak (Koen)
 
 Acked:
 
@@ -78,3 +77,6 @@
 137c597e5635e94070a8b4e425094f828c7ad56a libmimedir 0.3.1: Remove DEFAULT_PREFERENCE=1, set -1 due to known bugs. (PaulS, Koen, Marcin)
 40ab8178005b44226c94200bdcb19bca0262e49c simpad kernel update (PaulS, Koen)
 33c44c7c7ce5fce5da6c869be191126d5fca6f96 bluez-utils 3.23 and friends: Set FILESPATH explicitly and correctly. (PaulS, Koen)
+02945aaeb0e67e273a58bf42b1a0a7988a413f92 cups tweak (Koen, PaulS)
+
+
============================================================
--- packages/cups/cups.inc	222ec9d8aeac6ec4e9ebcaaaa920915c43052b25
+++ packages/cups/cups.inc	08e5210923c3872e4467981f0a7aaa9738a57165
@@ -64,6 +64,12 @@ python do_package_append() {
 	os.system('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir)
 }
 
+PACKAGES =+ "${PN}-lib ${PN}-libimage"
+
+FILES_${PN}-lib = "${libdir}/libcups.so.*"
+
+FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*"
+
 FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \
                     ${libdir}/cups/cgi-bin/.debug \
 		    ${libdir}/cups/filter/.debug \
@@ -79,5 +85,3 @@ FILES_${PN} += "${datadir}/doc/cups/imag
                 ${datadir}/icons/ \
 	       "
 
-LEAD_SONAME = "libcups.so.*"
-
============================================================
--- packages/cups/cups_1.2.10.bb	61eb68a7e7eb38c6af4139bae6ef7c9be81c5acf
+++ packages/cups/cups_1.2.10.bb	e2406d561f2df9078da93d2a26c2ebd15e78b078
@@ -1,4 +1,4 @@ require cups.inc
 require cups.inc
 
-PR = "r2"
+PR = "r3"
 
============================================================
--- packages/cups/cups_1.2.12.bb	dc5d10665104ca7d5faa51dabb605e562691f6e9
+++ packages/cups/cups_1.2.12.bb	8edcc03e28f79076b582dc309d6a7690e3901663
@@ -1,5 +1,5 @@ require cups.inc
 require cups.inc
 
-PR = "r0"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"


#
# mt diff -rbd8408430d3ce62c130d02580b0b03d7c7c50e45 -r1531c8535e06770d5e87478e4a8614904f51e409
#
# 
# 
# patch "contrib/angstrom/build-release.sh"
#  from [88bfd613aa56bfa26e1519c63464bfc02252720b]
#    to [8dc1e9b29845a9c075fc3e435e7c45e22c7cdbf6]
# 
============================================================
--- contrib/angstrom/build-release.sh	88bfd613aa56bfa26e1519c63464bfc02252720b
+++ contrib/angstrom/build-release.sh	8dc1e9b29845a9c075fc3e435e7c45e22c7cdbf6
@@ -1,25 +1,32 @@
 #!/bin/bash
 
+DO_GLIBC=1
 DO_UCLIBC=0
 
 do_build() {
 	echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf
 
-	BUILD_MODE="glibc"
-	if [ "$BUILD_CLEAN" != "" ]
+	if [ $DO_GLIBC = 1 ]
 	then
-		bitbake -c clean $BUILD_CLEAN
+		BUILD_MODE="glibc"
+		if [ "$BUILD_CLEAN" != "" ]
+		then
+			bitbake -c clean $BUILD_CLEAN
+		fi
+		for target in $BUILD_TARGETS
+		do
+			bitbake $target && do_report_success
+		done
 	fi
 
-	for target in $BUILD_TARGETS
-	do
-		bitbake $target && do_report_success
-	done
-
 	if [ $DO_UCLIBC = 1 ]
 	then
 		BUILD_MODE="uclibc"
 		echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf
+		if [ "$BUILD_CLEAN" != "" ]
+		then
+			bitbake -c clean $BUILD_CLEAN
+		fi
 		for target in $BUILD_TARGETS
 		do
 			bitbake $target && do_report_success
@@ -111,3 +118,28 @@ done
 #	do_build
 #done
 
+#
+# Special uclibc targets
+#
+DO_GLIBC=0
+DO_UCLIBC=1
+
+# Bootmenu image
+# As of now, not machine-dependent, so we build random armv5 machine
+# Better to build armv4, but that's what I actually tested ;-). So, on TODO.
+for machine in h4000
+do
+	BUILD_CLEAN=""
+	BUILD_MACHINE=$machine
+	BUILD_TARGETS="initramfs-bootmenu-image"
+	do_build
+done
+
+# LiveRamdisk core. Same note applies.
+for machine in h4000
+do
+	BUILD_CLEAN=""
+	BUILD_MACHINE=$machine
+	BUILD_TARGETS="liveramdisk-image"
+	do_build
+done