[oe-commits] org.oe.dev merge of '2b629c70f36efd84d9157bcab5d582d59fa8258e'

pfalcon commit openembedded-commits at lists.openembedded.org
Mon Jan 28 00:15:53 UTC 2008 

merge of '2b629c70f36efd84d9157bcab5d582d59fa8258e'
     and 'a99dc9b34551aa3889d7057538bf2e37b0471af1'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 2ab43fd44163ef54ceb8ddb42879e7220b856fbc
ViewMTN: http://monotone.openembedded.org/revision/info/2ab43fd44163ef54ceb8ddb42879e7220b856fbc
Files:
1
classes/patch.bbclass
packages/bluez/bluez-cups-backend_3.23.bb
packages/bluez/bluez-gstreamer-plugin_3.23.bb
packages/bluez/bluez-utils-alsa_3.23.bb
packages/bluez/bluez-utils3.inc
packages/bluez/bluez-utils_3.23.bb
packages/gnuplot/gnuplot-4.2.0
packages/altboot/altboot_1.1.1+wip-SVNR77.bb
packages/altboot/altboot_1.1.1+wip-SVNR78.bb
packages/cmake/cmake-native_2.4.7.bb
packages/cmake/cmake-native_2.4.8.bb
packages/cmake/cmake_2.4.7.bb
packages/cmake/cmake_2.4.8.bb
packages/gnuplot/files/debian-separate-x11-package.patch
packages/gnuplot/gnuplot-4.0.0/debian-separate-x11-package.patch
packages/gnuplot/files/matrix.patch
packages/gnuplot/gnuplot-4.0.0/matrix.patch
packages/gnuplot/files/subdirs.patch
packages/gnuplot/gnuplot-4.0.0/subdirs.patch
packages/gnuplot/files/term.patch
packages/gnuplot/gnuplot-4.0.0/term.patch
packages/gnuplot/gnuplot-4.2.0/subdirs.patch
packages/gnuplot/gnuplot-4.2.0/term.patch
packages/gnuplot/gnuplot_4.2.0.bb
packages/gnuplot/gnuplot_4.2.2.bb
packages/gnuplot/gnuplot-4.0.0
packages/gnuplot/gnuplot_cvs.bb
conf/checksums.ini
conf/distro/include/angstrom-2007-preferred-versions.inc
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/fastjar/fastjar-native_0.95.bb
packages/opie-taskbar/opie-taskbar-images.inc
Diffs:

#
# mt diff -r2b629c70f36efd84d9157bcab5d582d59fa8258e -r2ab43fd44163ef54ceb8ddb42879e7220b856fbc
#
# 
# 
# patch "classes/patch.bbclass"
#  from [eedc7c6dfbe33a021023d2efe764b60cca95d6da]
#    to [0edda47bdb23da5a42e73c4cdbfa62dc4c932215]
# 
# patch "packages/bluez/bluez-cups-backend_3.23.bb"
#  from [bc43b7c062d229869f1202c10c67f7ab26a327e0]
#    to [1e66f4ef912ceab694ca76eb3b8cd79156724046]
# 
# patch "packages/bluez/bluez-gstreamer-plugin_3.23.bb"
#  from [fb6efa105f94dbd193aed80095f24c7cc0e70355]
#    to [2291a69c590e3f7708cdf2d47efe32998fcdb7ed]
# 
# patch "packages/bluez/bluez-utils-alsa_3.23.bb"
#  from [7a8b78b118f7dc36dfcca67ece0c3004da5415df]
#    to [8af83a704602760f9d8167ef0efa93dd24817759]
# 
# patch "packages/bluez/bluez-utils3.inc"
#  from [f1cbdfc74564a82c238bb6862de2fcbadb369e01]
#    to [3ae629dcab5f90f03d9a52c099f562c86f8f431b]
# 
# patch "packages/bluez/bluez-utils_3.23.bb"
#  from [e19b966dd298ba92c4980f3df32211c2eeffc8f1]
#    to [9b5873bc1f92f70365ffaf73cb383d0478d2a749]
# 
============================================================
--- classes/patch.bbclass	eedc7c6dfbe33a021023d2efe764b60cca95d6da
+++ classes/patch.bbclass	0edda47bdb23da5a42e73c4cdbfa62dc4c932215
@@ -526,7 +526,7 @@ python patch_do_patch() {
 				bb.note("Patch '%s' applies to earlier revisions" % pname)
 				continue
 
-		bb.note("Applying patch '%s'" % pname)
+		bb.note("Applying patch '%s' (%s)" % (pname, unpacked))
 		try:
 			patchset.Import({"file":unpacked, "remote":url, "strippath": pnum}, True)
 		except:
============================================================
--- packages/bluez/bluez-cups-backend_3.23.bb	bc43b7c062d229869f1202c10c67f7ab26a327e0
+++ packages/bluez/bluez-cups-backend_3.23.bb	1e66f4ef912ceab694ca76eb3b8cd79156724046
@@ -1,5 +1,5 @@ require bluez-utils3.inc
 require bluez-utils3.inc
-
+PR = "r1"
 DEPENDS += "cups"
 
 # see bluez-utils3.inc for the explanation of these option
============================================================
--- packages/bluez/bluez-gstreamer-plugin_3.23.bb	fb6efa105f94dbd193aed80095f24c7cc0e70355
+++ packages/bluez/bluez-gstreamer-plugin_3.23.bb	2291a69c590e3f7708cdf2d47efe32998fcdb7ed
@@ -1,5 +1,5 @@ require bluez-utils3.inc
 require bluez-utils3.inc
-
+PR = "r1"
 DEPENDS += "gstreamer gst-plugins-base "
 
 # see bluez-utils3.inc for the explanation of these option
============================================================
--- packages/bluez/bluez-utils-alsa_3.23.bb	7a8b78b118f7dc36dfcca67ece0c3004da5415df
+++ packages/bluez/bluez-utils-alsa_3.23.bb	8af83a704602760f9d8167ef0efa93dd24817759
@@ -1,4 +1,5 @@ require bluez-utils3.inc
 require bluez-utils3.inc
+PR = "r1"
 
 DEPENDS += "alsa-lib"
 
============================================================
--- packages/bluez/bluez-utils3.inc	f1cbdfc74564a82c238bb6862de2fcbadb369e01
+++ packages/bluez/bluez-utils3.inc	3ae629dcab5f90f03d9a52c099f562c86f8f431b
@@ -8,11 +8,14 @@ LICENSE = "GPL"
 RCONFLICTS_${PN} = "bluez-utils-nodbus"
 LICENSE = "GPL"
 
+FILESPATH = "${FILE_DIRNAME}/bluez-utils-${PV}:${FILE_DIRNAME}/bluez-utils"
+
 # ti patch should be sent it upstream!
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
            file://hcid.conf \
            file://hciattach-ti-bts.patch;patch=1"
 
+
 S = "${WORKDIR}/bluez-utils-${PV}"
 
 inherit autotools update-rc.d
============================================================
--- packages/bluez/bluez-utils_3.23.bb	e19b966dd298ba92c4980f3df32211c2eeffc8f1
+++ packages/bluez/bluez-utils_3.23.bb	9b5873bc1f92f70365ffaf73cb383d0478d2a749
@@ -1,5 +1,5 @@ require bluez-utils3.inc
 require bluez-utils3.inc
-PR = "r1"
+PR = "r2"
 
 # see bluez-utils3.inc for the explanation of these option
 EXTRA_OECONF = " \


#
# mt diff -ra99dc9b34551aa3889d7057538bf2e37b0471af1 -r2ab43fd44163ef54ceb8ddb42879e7220b856fbc
#
# 
# 
# delete "packages/gnuplot/gnuplot-4.2.0"
# 
# rename "packages/altboot/altboot_1.1.1+wip-SVNR77.bb"
#     to "packages/altboot/altboot_1.1.1+wip-SVNR78.bb"
# 
# rename "packages/cmake/cmake-native_2.4.7.bb"
#     to "packages/cmake/cmake-native_2.4.8.bb"
# 
# rename "packages/cmake/cmake_2.4.7.bb"
#     to "packages/cmake/cmake_2.4.8.bb"
# 
# rename "packages/gnuplot/files/debian-separate-x11-package.patch"
#     to "packages/gnuplot/gnuplot-4.0.0/debian-separate-x11-package.patch"
# 
# rename "packages/gnuplot/files/matrix.patch"
#     to "packages/gnuplot/gnuplot-4.0.0/matrix.patch"
# 
# rename "packages/gnuplot/files/subdirs.patch"
#     to "packages/gnuplot/gnuplot-4.0.0/subdirs.patch"
# 
# rename "packages/gnuplot/files/term.patch"
#     to "packages/gnuplot/gnuplot-4.0.0/term.patch"
# 
# rename "packages/gnuplot/gnuplot-4.2.0/subdirs.patch"
#     to "packages/gnuplot/files/subdirs.patch"
# 
# rename "packages/gnuplot/gnuplot-4.2.0/term.patch"
#     to "packages/gnuplot/files/term.patch"
# 
# rename "packages/gnuplot/gnuplot_4.2.0.bb"
#     to "packages/gnuplot/gnuplot_4.2.2.bb"
# 
# add_dir "packages/gnuplot/gnuplot-4.0.0"
# 
# add_file "packages/gnuplot/gnuplot_cvs.bb"
#  content [fc07214c5ba39477584bd102d53aa602c87ab77c]
# 
# patch "conf/checksums.ini"
#  from [bb06a48a4ec82a40020ae300fded25f0dba2627c]
#    to [f3de66c07704795e4d713a57ccd83f857a134a2b]
# 
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
#  from [cb176be489c8cc84cc322cac2f96f85758f594fe]
#    to [c768b9d1c19df1d7e887abfa05c239ccf9218529]
# 
# patch "packages/altboot/altboot_1.1.1+wip-SVNR78.bb"
#  from [2e034d5c253a97df078a6cb997155f41b343bac3]
#    to [e7448ea24abd4e393507febae23ebd7c18501aca]
# 
# patch "packages/apex/apex-nslu2-1.5.13/defconfig"
#  from [6b49cd1b3da1a840b1f89d8a85bb5b8491c2bcc6]
#    to [9db0bfb9ebc6705433c99c696ba36dac581e02fa]
# 
# patch "packages/apex/apex-nslu2-16mb-1.5.13/defconfig"
#  from [23f6924d48366d8ea59a0b5e04f3faf94d40ae81]
#    to [4e83df9ba95b4df187098c4eb879fa4643b4daec]
# 
# patch "packages/apex/apex-nslu2-16mb_1.5.13.bb"
#  from [7a4d7e6091f47208b9adf22030c27c139f7c7497]
#    to [24cb820a7987fd9416e9221b948be3beb00293fb]
# 
# patch "packages/apex/apex-nslu2_1.5.13.bb"
#  from [75c8fa6cede30d5a2029f4988edf53a08d73ae6a]
#    to [a70de30bd9f963bdc393a4f81f915fd497874512]
# 
# patch "packages/fastjar/fastjar-native_0.95.bb"
#  from [3c4528fae3a802f047b2afe2a77ec390f93bba35]
#    to [e8b2518397f26189342735a6379ed887085b5cd9]
# 
# patch "packages/gnuplot/gnuplot_4.2.2.bb"
#  from [03f32275753ca6d0330c16d5e953d3076ae0a61c]
#    to [2735c3e3ef088dab319af681d7d090294056717c]
# 
# patch "packages/opie-taskbar/opie-taskbar-images.inc"
#  from [5ea7ec11fbf8d872fd9f33f7bd8f81437a7785dc]
#    to [078509952dd4672e806f529f7547d793f8efa1e4]
# 
============================================================
--- packages/gnuplot/gnuplot_cvs.bb	fc07214c5ba39477584bd102d53aa602c87ab77c
+++ packages/gnuplot/gnuplot_cvs.bb	fc07214c5ba39477584bd102d53aa602c87ab77c
@@ -0,0 +1,17 @@
+require gnuplot.inc
+
+PV = "4.3.0+cvs${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "cvs://anonymous@gnuplot.cvs.sourceforge.net/cvsroot/${PN};module=${PN} \
+           http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz \
+           file://subdirs.patch;patch=1 \
+           file://term.patch;patch=1 \
+           file://gnuplot.desktop \
+           file://gnuplot.png"
+
+S = "${WORKDIR}/${PN}"
+
+do_configure_prepend() {
+           ./prepare
+}
============================================================
--- conf/checksums.ini	bb06a48a4ec82a40020ae300fded25f0dba2627c
+++ conf/checksums.ini	f3de66c07704795e4d713a57ccd83f857a134a2b
@@ -1554,9 +1554,9 @@ sha256=f0127ba9cd9936b08f982999f6fd9004c
 md5=c0b57a115e24005f9828ca7b53908779
 sha256=f0127ba9cd9936b08f982999f6fd9004c8c4b97401e68bda4d91eec29300d8bd
 
-[http://www.cmake.org/files/v2.4/cmake-2.4.7.tar.gz]
-md5=4476c423b8f74266136964e42ea88028
-sha256=2fd5feb294b933ae3a0071b8c7a396797cf79dfe6b0ffeff8788e07ff4107d56
+[http://www.cmake.org/files/v2.4/cmake-2.4.8.tar.gz]
+md5=f5dd061c31765a49dc17ae8bdc986779
+sha256=f20607d4f33376ea648307681630574662d0c3f59d88a7a02ad547b6320631f1
 
 [ftp://ftp.logilab.fr/pub/common/common-0.4.4.tar.gz]
 md5=4cd3ce38efbd27c6cf4223f0ced2a5b5
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc	cb176be489c8cc84cc322cac2f96f85758f594fe
+++ conf/distro/include/angstrom-2007-preferred-versions.inc	c768b9d1c19df1d7e887abfa05c239ccf9218529
@@ -509,7 +509,7 @@ PREFERRED_VERSION_gnupg ?= "1.4.2.2"
 PREFERRED_VERSION_gnuchess ?= "5.05"
 PREFERRED_VERSION_gnumeric ?= "1.6.3"
 PREFERRED_VERSION_gnupg ?= "1.4.2.2"
-PREFERRED_VERSION_gnuplot ?= "4.2.0"
+PREFERRED_VERSION_gnuplot ?= "4.2.2"
 PREFERRED_VERSION_gnuradio ?= "3.0.4"
 PREFERRED_VERSION_gnutls ?= "1.6.3"
 PREFERRED_VERSION_gob2 ?= "2.0.14"
============================================================
--- packages/altboot/altboot_1.1.1+wip-SVNR77.bb	2e034d5c253a97df078a6cb997155f41b343bac3
+++ packages/altboot/altboot_1.1.1+wip-SVNR78.bb	e7448ea24abd4e393507febae23ebd7c18501aca
@@ -1,8 +1,8 @@ PR = "r0"
 require altboot.inc
 
 PR = "r0"
 
-SVN_REV = "77"
+SVN_REV = "78"
 SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \
 	  "
 
============================================================
--- packages/apex/apex-nslu2-1.5.13/defconfig	6b49cd1b3da1a840b1f89d8a85bb5b8491c2bcc6
+++ packages/apex/apex-nslu2-1.5.13/defconfig	9db0bfb9ebc6705433c99c696ba36dac581e02fa
@@ -136,7 +136,8 @@ CONFIG_ENV_STARTUP_KERNEL_COPY=y
 CONFIG_AUTOBOOT_DELAY=10
 CONFIG_ENV_STARTUP_KERNEL_COPY=y
 # CONFIG_ENV_REGION_KERNEL_SWAP is not set
-# CONFIG_ENV_STARTUP_PREFIX_P is not set
+CONFIG_ENV_STARTUP_PREFIX_P=y
+CONFIG_ENV_STARTUP_PREFIX="sdram-init; memscan -u 0+256m"
 
 #
 #    Regions
============================================================
--- packages/apex/apex-nslu2-16mb-1.5.13/defconfig	23f6924d48366d8ea59a0b5e04f3faf94d40ae81
+++ packages/apex/apex-nslu2-16mb-1.5.13/defconfig	4e83df9ba95b4df187098c4eb879fa4643b4daec
@@ -136,7 +136,8 @@ CONFIG_ENV_STARTUP_KERNEL_COPY=y
 CONFIG_AUTOBOOT_DELAY=10
 CONFIG_ENV_STARTUP_KERNEL_COPY=y
 # CONFIG_ENV_REGION_KERNEL_SWAP is not set
-# CONFIG_ENV_STARTUP_PREFIX_P is not set
+CONFIG_ENV_STARTUP_PREFIX_P=y
+CONFIG_ENV_STARTUP_PREFIX="sdram-init; memscan -u 0+256m"
 
 #
 #    Regions
============================================================
--- packages/apex/apex-nslu2-16mb_1.5.13.bb	7a4d7e6091f47208b9adf22030c27c139f7c7497
+++ packages/apex/apex-nslu2-16mb_1.5.13.bb	24cb820a7987fd9416e9221b948be3beb00293fb
@@ -1,9 +1,9 @@ LICENSE = "GPL"
 DESCRIPTION = "APEX Boot Loader"
 SECTION = ""
 PRIORITY = "optional"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
 	   file://defconfig"
============================================================
--- packages/apex/apex-nslu2_1.5.13.bb	75c8fa6cede30d5a2029f4988edf53a08d73ae6a
+++ packages/apex/apex-nslu2_1.5.13.bb	a70de30bd9f963bdc393a4f81f915fd497874512
@@ -1,9 +1,9 @@ LICENSE = "GPL"
 DESCRIPTION = "APEX Boot Loader"
 SECTION = ""
 PRIORITY = "optional"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
 	   file://defconfig"
============================================================
--- packages/fastjar/fastjar-native_0.95.bb	3c4528fae3a802f047b2afe2a77ec390f93bba35
+++ packages/fastjar/fastjar-native_0.95.bb	e8b2518397f26189342735a6379ed887085b5cd9
@@ -1,9 +1,11 @@ LICENSE = "GPL"
 DESCRIPTION = "jar replacement written in C."
 HOMEPAGE = "http://savannah.nongnu.org/projects/fastjar/"
 SECTION = "devel"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
+PR = "r1"
+
 DEPENDS = "zlib-native"
 
 SRC_URI = "http://download.savannah.nongnu.org/releases/fastjar/fastjar-${PV}.tar.gz"
@@ -20,7 +22,8 @@ do_stage() {
 }
 
 do_stage() {
+	#we should teach autotools.bbclass:autotools_stage_all() about ${STAGING_BINDIR}
 	install -d ${STAGING_BINDIR}
-	install -m 755 fastjar ${STAGING_BINDIR}/fastjar
-	install -m 755 grepjar ${STAGING_BINDIR}
+	install -m 755 .libs/fastjar ${STAGING_BINDIR}/fastjar
+	install -m 755 .libs/grepjar ${STAGING_BINDIR}
 }
============================================================
--- packages/gnuplot/gnuplot_4.2.0.bb	03f32275753ca6d0330c16d5e953d3076ae0a61c
+++ packages/gnuplot/gnuplot_4.2.2.bb	2735c3e3ef088dab319af681d7d090294056717c
@@ -1,6 +1,6 @@ require gnuplot.inc
 require gnuplot.inc
 
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${PN}-${PV}.tar.gz \
            http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz \
============================================================
--- packages/opie-taskbar/opie-taskbar-images.inc	5ea7ec11fbf8d872fd9f33f7bd8f81437a7785dc
+++ packages/opie-taskbar/opie-taskbar-images.inc	078509952dd4672e806f529f7547d793f8efa1e4
@@ -54,4 +54,4 @@ PACKAGE_ARCH = "all"
 }
 
 PACKAGE_ARCH = "all"
+PACKAGES = "${PN}-dbg ${PN}-320x480 ${PN}-480x320 ${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320 ${PN}-320x320"
-PACKAGES =+ "${PN}-dbg ${PN}-320x480 ${PN}-480x320 ${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320 ${PN}-320x320"

More information about the Openembedded-commits mailing list