From: Holger Hans Peter Freyther Date: Wed, 22 Oct 2008 20:33:26 +0000 (+0200) Subject: Merge branch 'shared/file-pr-revert' into org.openembedded.dev X-Git-Tag: Release-2010-05/1~5716 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53bfb2398c16d2065ffa2bc6cd34c83e15347014;p=openembedded.git Merge branch 'shared/file-pr-revert' into org.openembedded.dev Conflicts: packages/busybox/busybox_1.11.3.bb packages/dsplink/codec-engine_2.10.bb packages/gdb/gdb_6.3.bb packages/gdb/gdb_6.4.bb packages/gdb/gdb_6.6.bb packages/gdb/gdb_6.8.bb packages/glibc/glibc_2.2.5.bb packages/glibc/glibc_2.3.2+cvs20040726.bb packages/glibc/glibc_2.3.2.bb packages/glibc/glibc_2.3.3+cvs20041128.bb packages/glibc/glibc_2.3.3+cvs20050221.bb packages/glibc/glibc_2.3.3+cvs20050420.bb packages/glibc/glibc_2.3.3.bb packages/glibc/glibc_2.3.5+cvs20050627.bb packages/glibc/glibc_2.3.6.bb packages/glibc/glibc_2.4.bb packages/glibc/glibc_2.5.bb packages/glibc/glibc_2.6.1.bb packages/glibc/glibc_2.7.bb packages/kexecboot/linux-kexecboot_2.6.26.bb packages/libsdl/libsdl-x11_1.2.11.bb packages/linux/linux-rp_2.6.26.bb packages/mozilla/fennec_hg.bb packages/python/python_2.5.2.bb packages/tasks/task-xfce-base.bb packages/xorg-driver/xf86-video-omapfb_git.bb packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb --- 53bfb2398c16d2065ffa2bc6cd34c83e15347014 diff --cc packages/busybox/busybox_1.11.3.bb index ce2b51a24b,4d488218e2..790bf518cc --- a/packages/busybox/busybox_1.11.3.bb +++ b/packages/busybox/busybox_1.11.3.bb @@@ -1,5 -1,5 +1,5 @@@ require busybox.inc - FILE_PR = "r0" -PR = "r3" ++PR = "r0" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ diff --cc packages/ccid/ccid_1.3.8.bb index 033af6c3d5,0000000000..c2ade3119a mode 100644,000000..100644 --- a/packages/ccid/ccid_1.3.8.bb +++ b/packages/ccid/ccid_1.3.8.bb @@@ -1,21 -1,0 +1,21 @@@ +DESCRIPTION = "Generic USB CCID smart card reader driver" +HOMEPAGE = "http://pcsclite.alioth.debian.org/ccid.html" +LICENSE = "GPL" - FILE_PR = "r0" ++PR = "r0" + +DEPENDS = "libusb pcsc-lite" +RDEPENDS = "pcsc-lite" + +SRC_URI = "http://alioth.debian.org/download.php/2482/ccid-${PV}.tar.bz2" + +inherit autotools + +EXTRA_OECONF = "--enable-udev" + +do_install_append () { + install -d "${D}/etc/udev/rules.d" + install -m 644 "${S}/src/pcscd_ccid.rules" "${D}/etc/udev/rules.d/85-pcscd_ccid.rules" +} + +FILES_${PN} += "${libdir}/pcsc/" +FILES_${PN}-dbg += "${libdir}/pcsc/drivers/*/*/*/.debug" diff --cc packages/dmidecode/dmidecode_2.9.bb index bb13500eff,0000000000..2186120498 mode 100644,000000..100644 --- a/packages/dmidecode/dmidecode_2.9.bb +++ b/packages/dmidecode/dmidecode_2.9.bb @@@ -1,19 -1,0 +1,19 @@@ +DESCRIPTION = "DMI (Desktop Management Interface) table related utilities" +HOMEPAGE = "http://www.nongnu.org/dmidecode/" +LICENSE = "GPLv2" - FILE_PR = "r0" ++PR = "r0" + +SRC_URI = "http://savannah.nongnu.org/download/dmidecode/${P}.tar.bz2" + +COMPATIBLE_HOST = "i.86.*-linux" + +do_unpack_extra() { + sed -i \ + -e '/^prefix/s:/usr/local:/usr:' \ + Makefile +} +addtask unpack_extra after do_unpack before do_patch + +do_install() { + oe_runmake DESTDIR="${D}" install +} diff --cc packages/gdb/gdb_6.3.bb index 5513d348d0,a558775ff4..988cfb4c44 --- a/packages/gdb/gdb_6.3.bb +++ b/packages/gdb/gdb_6.3.bb @@@ -1,3 -1,3 +1,3 @@@ require gdb.inc - FILE_PR = "r4" -PR = "r3" ++PR = "r4" diff --cc packages/gdb/gdb_6.4.bb index 134c38426d,de6bcf34ba..be40f3f12b --- a/packages/gdb/gdb_6.4.bb +++ b/packages/gdb/gdb_6.4.bb @@@ -1,3 -1,3 +1,3 @@@ require gdb.inc - FILE_PR = "r2" -PR = "r1" ++PR = "r2" diff --cc packages/gdb/gdb_6.6.bb index db1a89b706,c507a48aa8..e4502a648e --- a/packages/gdb/gdb_6.6.bb +++ b/packages/gdb/gdb_6.6.bb @@@ -1,5 -1,5 +1,5 @@@ require gdb.inc - FILE_PR = "r5" -PR = "r4" ++PR = "r5" SRC_URI += "file://early_debug_in_nptl.patch;patch=1;pnum=0" diff --cc packages/gdb/gdb_6.7.1.bb index 167c415dde,a411974b15..fedf2bf1f1 --- a/packages/gdb/gdb_6.7.1.bb +++ b/packages/gdb/gdb_6.7.1.bb @@@ -1,7 -1,5 +1,7 @@@ require gdb.inc - FILE_PR = "r1" ++PR = "r1" + DEFAULT_PREFERENCE_avr32 = "99" SRC_URI_avr32 = " http://avr32linux.org/twiki/pub/Main/GDBPatches/gdb-6.7.1.atmel.1.0.3.tar.bz2" S_avr32 = "${WORKDIR}/gdb-6.7.1.atmel.1.0.3" diff --cc packages/gdb/gdb_6.8.bb index 134c38426d,5b8f3769bd..be40f3f12b --- a/packages/gdb/gdb_6.8.bb +++ b/packages/gdb/gdb_6.8.bb @@@ -1,3 -1,3 +1,3 @@@ require gdb.inc - FILE_PR = "r2" -PR = "r1" ++PR = "r2" diff --cc packages/glibc/glibc_2.2.5.bb index e870f89abb,3e57d857ae..c7d308b6a2 --- a/packages/glibc/glibc_2.2.5.bb +++ b/packages/glibc/glibc_2.2.5.bb @@@ -1,7 -1,7 +1,7 @@@ require glibc.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" - FILE_PR = "r19" -PR = "r18" ++PR = "r19" DEFAULT_PREFERENCE_sh3 = "-99" diff --cc packages/glibc/glibc_2.3.2+cvs20040726.bb index 774333f1e7,c53c2dd620..f0521d41ab --- a/packages/glibc/glibc_2.3.2+cvs20040726.bb +++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb @@@ -3,7 -3,7 +3,7 @@@ require glibc.in DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" - FILE_PR = "r30" -PR = "r29" ++PR = "r30" GLIBC_ADDONS ?= "linuxthreads" diff --cc packages/glibc/glibc_2.3.2.bb index 6630161900,05b46ba2e9..891d9da388 --- a/packages/glibc/glibc_2.3.2.bb +++ b/packages/glibc/glibc_2.3.2.bb @@@ -1,6 -1,6 +1,6 @@@ require glibc.inc - FILE_PR = "r19" -PR = "r18" ++PR = "r19" DEFAULT_PREFERENCE_sh3 = "-99" diff --cc packages/glibc/glibc_2.3.3+cvs20041128.bb index e5feae6514,a2492f6801..560347d770 --- a/packages/glibc/glibc_2.3.3+cvs20041128.bb +++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb @@@ -3,7 -3,7 +3,7 @@@ require glibc.in DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" - FILE_PR = "r15" -PR = "r14" ++PR = "r15" GLIBC_ADDONS ?= "linuxthreads" diff --cc packages/glibc/glibc_2.3.3+cvs20050221.bb index fee5e5ab44,16525029da..e0becb8c3f --- a/packages/glibc/glibc_2.3.3+cvs20050221.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb @@@ -3,7 -3,7 +3,7 @@@ require glibc.in DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" - FILE_PR = "r15" -PR = "r14" ++PR = "r15" GLIBC_ADDONS ?= "linuxthreads" diff --cc packages/glibc/glibc_2.3.3+cvs20050420.bb index 137e8f4756,bd394921b9..1ae351889c --- a/packages/glibc/glibc_2.3.3+cvs20050420.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb @@@ -5,7 -5,7 +5,7 @@@ DEFAULT_PREFERENCE_i586 = "0 DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" - FILE_PR = "r13" -PR = "r12" ++PR = "r13" GLIBC_ADDONS ?= "linuxthreads" diff --cc packages/glibc/glibc_2.3.3.bb index 9c97477ed8,2908baf4cb..03711f7ae3 --- a/packages/glibc/glibc_2.3.3.bb +++ b/packages/glibc/glibc_2.3.3.bb @@@ -1,6 -1,6 +1,6 @@@ require glibc.inc - FILE_PR = "r16" -PR = "r15" ++PR = "r16" DEFAULT_PREFERENCE_sh3 = "-99" diff --cc packages/glibc/glibc_2.3.5+cvs20050627.bb index 3f767537b6,54a1654404..c9d0b66daf --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@@ -2,7 -2,7 +2,7 @@@ require glibc.in FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" SRCDATE = "20050627" - FILE_PR = "r22" -PR = "r21" ++PR = "r22" #Doesnt build for sh3 DEFAULT_PREFERENCE_sh3="-1" diff --cc packages/glibc/glibc_2.3.6.bb index c55216c04f,edf15cab61..8442a15e69 --- a/packages/glibc/glibc_2.3.6.bb +++ b/packages/glibc/glibc_2.3.6.bb @@@ -1,6 -1,6 +1,6 @@@ require glibc.inc - FILE_PR = "r4" -PR = "r3" ++PR = "r4" #FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.3.6', '${FILE_DIRNAME}/orig/glibc', '${FILE_DIRNAME}/orig/files', '${FILE_DIRNAME}/orig' ], d)}" diff --cc packages/glibc/glibc_2.4.bb index 3f32f0cb88,17cebf8921..8ee10003df --- a/packages/glibc/glibc_2.4.bb +++ b/packages/glibc/glibc_2.4.bb @@@ -1,6 -1,6 +1,6 @@@ require glibc.inc - FILE_PR = "r20" -PR = "r19" ++PR = "r20" #add the hosts that are confirmed to be working to COMPATIBLE_HOSTi COMPATIBLE_HOST = '(i.86.*-linux|sh.*-linux)' diff --cc packages/glibc/glibc_2.5.bb index d769bd7dee,a5908762ef..6e2295904b --- a/packages/glibc/glibc_2.5.bb +++ b/packages/glibc/glibc_2.5.bb @@@ -1,5 -1,5 +1,5 @@@ require glibc.inc - FILE_PR = "r18" -PR = "r17" ++PR = "r18" ARM_INSTRUCTION_SET = "arm" diff --cc packages/glibc/glibc_2.6.1.bb index 0254811564,5cd1d5b3e7..c563a1f389 --- a/packages/glibc/glibc_2.6.1.bb +++ b/packages/glibc/glibc_2.6.1.bb @@@ -1,5 -1,5 +1,5 @@@ require glibc.inc - FILE_PR = "r13" -PR = "r12" ++PR = "r13" PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" diff --cc packages/glibc/glibc_2.7.bb index c2e97af764,b6c329091c..3349ce5eef --- a/packages/glibc/glibc_2.7.bb +++ b/packages/glibc/glibc_2.7.bb @@@ -5,7 -5,7 +5,7 @@@ ARM_INSTRUCTION_SET = "arm PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" - FILE_PR = "r8" -PR = "r7" ++PR = "r8" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" diff --cc packages/kexecboot/linux-kexecboot_2.6.26.bb index 26af506132,2db6575a72..a0d00ab120 --- a/packages/kexecboot/linux-kexecboot_2.6.26.bb +++ b/packages/kexecboot/linux-kexecboot_2.6.26.bb @@@ -1,6 -1,6 +1,6 @@@ require linux-kexecboot.inc - FILE_PR = "r6" -PR = "r5" ++PR = "r6" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_qemuarm = "-1" DEFAULT_PREFERENCE_qemux86 = "-1" diff --cc packages/libsdl/libsdl-image_1.2.6.bb index b458e19dba,27b5aa7d1a..99fd98f508 --- a/packages/libsdl/libsdl-image_1.2.6.bb +++ b/packages/libsdl/libsdl-image_1.2.6.bb @@@ -1,7 -1,4 +1,7 @@@ require libsdl-image.inc - FILE_PR= "r1" ++PR = "r1" + +DEPENDS += "tiff" do_unpackpost() { # Removing this file fixes a libtool version mismatch. diff --cc packages/libsdl/libsdl-x11_1.2.11.bb index e9628d9e07,3f9120edb4..ab349d6306 --- a/packages/libsdl/libsdl-x11_1.2.11.bb +++ b/packages/libsdl/libsdl-x11_1.2.11.bb @@@ -3,7 -3,7 +3,7 @@@ require libsdl.in # extra-keys.patch is missing DEFAULT_PREFERENCE = "-1" - FILE_PR = "r7" -PR = "r6" ++PR = "r7" SRC_URI = "\ http://www.libsdl.org/release/SDL-${PV}.tar.gz \ diff --cc packages/linux/linux-rp_2.6.26.bb index 47932fdf0d,00e39a77a3..dd126285ea --- a/packages/linux/linux-rp_2.6.26.bb +++ b/packages/linux/linux-rp_2.6.26.bb @@@ -1,6 -1,6 +1,6 @@@ require linux-rp.inc - FILE_PR = "r5" -PR = "r4" ++PR = "r5" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_qemuarm = "-1" diff --cc packages/mozilla/fennec_hg.bb index b3cf0fd326,0760768e09..8c6f326f73 --- a/packages/mozilla/fennec_hg.bb +++ b/packages/mozilla/fennec_hg.bb @@@ -1,13 -1,13 +1,13 @@@ DESCRIPTION = "Mozilla Mobile browser" DEPENDS += "cairo alsa-lib " -PV = "0.8+0.9pre" -MOZPV = "0.9pre" -PR = "r10" +PV = "0.9+1.0a1" +MOZPV = "1.0a1" - FILE_PR = "r0" ++PR = "r0" PE = "1" -SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=3a9a64e5bedc \ - hg://hg.mozilla.org/;module=mobile-browser;rev=53d19b4b249a \ +SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=6c2f8bd79cbc \ + hg://hg.mozilla.org/;module=mobile-browser;rev=8f96b58057ad \ file://jsautocfg.h \ file://jsautocfg-dontoverwrite.patch;patch=1 \ " diff --cc packages/nfs-utils/nfs-utils_1.1.2.bb index b777f201eb,bcdabd59e5..872a9bf8ff --- a/packages/nfs-utils/nfs-utils_1.1.2.bb +++ b/packages/nfs-utils/nfs-utils_1.1.2.bb @@@ -3,9 -3,9 +3,9 @@@ PRIORITY = "optional SECTION = "console/network" LICENSE = "GPL" - FILE_PR = "2" + PR = "2" -DEPENDS = "tcp-wrappers libevent" +DEPENDS = "e2fsprogs tcp-wrappers libevent" SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \ file://nfsserver \ diff --cc packages/pcsc-lite/pcsc-lite_1.4.102.bb index 6d5bb44113,0000000000..0455ae47a8 mode 100644,000000..100644 --- a/packages/pcsc-lite/pcsc-lite_1.4.102.bb +++ b/packages/pcsc-lite/pcsc-lite_1.4.102.bb @@@ -1,35 -1,0 +1,35 @@@ +DESCRIPTION = "PC/SC Lite smart card framework and applications" +HOMEPAGE = "http://pcsclite.alioth.debian.org/" +LICENSE = "BSD" - FILE_PR = "r0" ++PR = "r0" + +DEPENDS = "hal" +RDEPENDS_${PN} = "hal" + +SRC_URI = "http://alioth.debian.org/download.php/2479/pcsc-lite-${PV}.tar.bz2 \ + file://pcscd.init " + +inherit autotools update-rc.d + +INITSCRIPT_NAME = "pcscd" +INITSCRIPT_PARAMS = "defaults" + +EXTRA_OECONF = " \ + --enable-libhal \ + --disable-libusb \ + --enable-usbdropdir=${libdir}/pcsc/drivers \ + " + +do_stage() { + autotools_stage_all +} + +do_install() { + oe_runmake DESTDIR="${D}" install + install -d "${D}/etc/init.d" + install -m 755 "${WORKDIR}/pcscd.init" "${D}/etc/init.d/pcscd" +} + +PACKAGES =+ "libpcsclite" + +FILES_libpcsclite = "${libdir}/libpcsclite.so.*" diff --cc packages/python/python_2.5.2.bb index d6e8bb3ab0,3ba35544a8..35bcf858e6 --- a/packages/python/python_2.5.2.bb +++ b/packages/python/python_2.5.2.bb @@@ -6,7 -6,7 +6,7 @@@ PRIORITY = "optional DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl tk zlib" DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" # bump this on every change in contrib/python/generate-manifest-2.5.py - FILE_PR = "ml13" -PR = "ml11" ++PR = "ml13" PYTHON_MAJMIN = "2.5" diff --cc packages/tasks/task-xfce-base.bb index b734341c54,c846b22de5..239725feaa --- a/packages/tasks/task-xfce-base.bb +++ b/packages/tasks/task-xfce-base.bb @@@ -4,7 -4,7 +4,7 @@@ DESCRIPTION = "All packages required for an base XFCE installation" LICENSE = "MIT" - FILE_PR = "r4" -PR = "r3" ++PR = "r4" inherit task diff --cc packages/xorg-driver/xf86-video-omapfb_git.bb index 34ce3de4ff,d14c1fd396..9be61695ae --- a/packages/xorg-driver/xf86-video-omapfb_git.bb +++ b/packages/xorg-driver/xf86-video-omapfb_git.bb @@@ -2,9 -2,9 +2,9 @@@ require xorg-driver-video.in DESCRIPTION = "X.Org X server -- OMAP display driver" - FILE_PR ="r10" -PR ="r8" ++PR ="r10" -SRCREV = "9a4fe691d60ac29e510dfa5180bd799ead86d1d5" +SRCREV = "7bf64be8e809d00c10c6bdae6933bdc71c642ea4" PV = "0.0.1+${PR}+git${SRCREV}" SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http" diff --cc packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb index 963b11221b,922d8f58f3..48ff0ea6fa --- a/packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb @@@ -3,7 -3,7 +3,7 @@@ require xserver-kdrive-common.in DEPENDS += "hal libxkbfile libxcalibrate pixman" PE = "1" - FILE_PR = "r3" -PR = "r2" ++PR = "r3" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \