From 767478b11ad7c1e260db8b391fc9c34176d81915 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 21 Feb 2008 13:07:36 +0000 Subject: renderext: Drop, superceeded by renderproto and X11R7.X --- packages/renderext/.mtn2git_empty | 0 packages/renderext/renderext_0.8.bb | 15 --------------- packages/renderext/renderext_cvs.bb | 18 ------------------ 3 files changed, 33 deletions(-) delete mode 100644 packages/renderext/.mtn2git_empty delete mode 100644 packages/renderext/renderext_0.8.bb delete mode 100644 packages/renderext/renderext_cvs.bb diff --git a/packages/renderext/.mtn2git_empty b/packages/renderext/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/renderext/renderext_0.8.bb b/packages/renderext/renderext_0.8.bb deleted file mode 100644 index a12f7c0da5..0000000000 --- a/packages/renderext/renderext_0.8.bb +++ /dev/null @@ -1,15 +0,0 @@ -SECTION = "libs" -LICENSE = "MIT-X" -DESCRIPTION = "X Render extension headers" - -SRC_URI = "${XLIBS_MIRROR}/renderext-${PV}.tar.bz2" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/packages/renderext/renderext_cvs.bb b/packages/renderext/renderext_cvs.bb deleted file mode 100644 index 08053d95b9..0000000000 --- a/packages/renderext/renderext_cvs.bb +++ /dev/null @@ -1,18 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "MIT-X" -SECTION = "libs" -DESCRIPTION = "X Render extension headers" -DEFAULT_PREFERENCE = "1" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Render" -S = "${WORKDIR}/Render" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} -- cgit v1.2.3 From baf908c40064e4769bb5a72ab3ef1c1d4a232439 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 21 Feb 2008 13:12:41 +0000 Subject: recordext: Drop, superceeded by recordproto and X11R7.X --- packages/recordext/.mtn2git_empty | 0 packages/recordext/recordext_cvs.bb | 17 ----------------- 2 files changed, 17 deletions(-) delete mode 100644 packages/recordext/.mtn2git_empty delete mode 100644 packages/recordext/recordext_cvs.bb diff --git a/packages/recordext/.mtn2git_empty b/packages/recordext/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/recordext/recordext_cvs.bb b/packages/recordext/recordext_cvs.bb deleted file mode 100644 index eeaae24762..0000000000 --- a/packages/recordext/recordext_cvs.bb +++ /dev/null @@ -1,17 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "BSD-X" -SECTION = "libs" -DESCRIPTION = "XRecord extension protocol bits" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=RecordExt" -S = "${WORKDIR}/RecordExt" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} -- cgit v1.2.3 From c70adf6fe1101553fda408f04c397333d3b0e827 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 21 Feb 2008 13:13:41 +0000 Subject: randrext: Drop, superceeded by randrproto and X11R7.X --- packages/randrext/.mtn2git_empty | 0 packages/randrext/randrext_1.0.bb | 15 --------------- packages/randrext/randrext_cvs.bb | 17 ----------------- 3 files changed, 32 deletions(-) delete mode 100644 packages/randrext/.mtn2git_empty delete mode 100644 packages/randrext/randrext_1.0.bb delete mode 100644 packages/randrext/randrext_cvs.bb diff --git a/packages/randrext/.mtn2git_empty b/packages/randrext/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/randrext/randrext_1.0.bb b/packages/randrext/randrext_1.0.bb deleted file mode 100644 index 3fe6a442ac..0000000000 --- a/packages/randrext/randrext_1.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -SECTION = "libs" -LICENSE= "BSD-X" -DESCRIPTION = "X Resize and Rotate extension headers" - -SRC_URI = "${XLIBS_MIRROR}/randrext-${PV}.tar.bz2" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/packages/randrext/randrext_cvs.bb b/packages/randrext/randrext_cvs.bb deleted file mode 100644 index 29cff38373..0000000000 --- a/packages/randrext/randrext_cvs.bb +++ /dev/null @@ -1,17 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE= "BSD-X" -SECTION = "libs" -DESCRIPTION = "X Resize and Rotate extension headers" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Randr" -S = "${WORKDIR}/Randr" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} -- cgit v1.2.3 From 4bc37472f48c57a434b5fc479050541cfe869e75 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 21 Feb 2008 13:17:28 +0000 Subject: sanity.bbclass: Remove some now unneeded code --- classes/sanity.bbclass | 5 ----- 1 file changed, 5 deletions(-) diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index 9ef2f09fe0..08b077a1e1 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -162,11 +162,6 @@ python check_sanity_eventhandler() { from bb import note, error, data, __version__ from bb.event import getName - try: - from distutils.version import LooseVersion - except ImportError: - def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1 - if getName(e) == "ConfigParsed": check_sanity(e) -- cgit v1.2.3 From 1f448521217ebe5947a87c953058b87b41e64931 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 21 Feb 2008 13:17:54 +0000 Subject: bitbake.conf: Add STAGING_EXECPREFIXDIR --- conf/bitbake.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 4caa55c0b6..d0aa47a143 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -228,6 +228,7 @@ STAGING_BINDIR = "${STAGING_DIR_HOST}${layout_bindir}" STAGING_LIBDIR = "${STAGING_DIR_HOST}${layout_libdir}" STAGING_INCDIR = "${STAGING_DIR_HOST}${layout_includedir}" STAGING_DATADIR = "${STAGING_DIR_HOST}${layout_datadir}" +STAGING_EXECPREFIXDIR = "${STAGING_DIR_HOST}${layout_exec_prefix}" STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader" STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware" STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" -- cgit v1.2.3 From e05f5c59801f4f8d7bdfcb6e9b97c6b513654776 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 21 Feb 2008 13:18:32 +0000 Subject: mkbold-mkitalic-native: Remove hardcoded staging references --- packages/xorg-app/mkbold-mkitalic-native_0.11.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/xorg-app/mkbold-mkitalic-native_0.11.bb b/packages/xorg-app/mkbold-mkitalic-native_0.11.bb index 40082ec816..24ff14e01a 100644 --- a/packages/xorg-app/mkbold-mkitalic-native_0.11.bb +++ b/packages/xorg-app/mkbold-mkitalic-native_0.11.bb @@ -12,10 +12,10 @@ S = "${WORKDIR}/mkbold-mkitalic-${PV}" inherit native do_stage() { - install -d ${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}/bin - install -m 755 mkbold ${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}/bin/ - install -m 755 mkitalic ${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}/bin/ - install -m 755 mkbolditalic ${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}/bin/ - install -m 755 ${WORKDIR}/makebifonts ${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}/bin/ + install -d ${STAGING_BINDIR_NATIVE} + install -m 755 mkbold ${STAGING_BINDIR_NATIVE}/ + install -m 755 mkitalic ${STAGING_BINDIR_NATIVE}/ + install -m 755 mkbolditalic ${STAGING_BINDIR_NATIVE}/ + install -m 755 ${WORKDIR}/makebifonts ${STAGING_BINDIR_NATIVE}/ } -- cgit v1.2.3 From 7901d1674a37406ca0ae289256fc6ab16131a66b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 21 Feb 2008 13:19:23 +0000 Subject: subversion: Remove hardcoded or plain broken staging references --- packages/subversion/subversion_1.3.1.bb | 2 +- packages/subversion/subversion_1.4.0.bb | 2 +- packages/subversion/subversion_1.4.3.bb | 2 +- packages/subversion/subversion_1.4.5.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/subversion/subversion_1.3.1.bb b/packages/subversion/subversion_1.3.1.bb index 1e40cd7a55..79e5e67d7b 100644 --- a/packages/subversion/subversion_1.3.1.bb +++ b/packages/subversion/subversion_1.3.1.bb @@ -9,7 +9,7 @@ SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ file://disable-revision-install.patch;patch=1 \ file://apr-regex.patch;patch=1" -EXTRA_OECONF = "--with-neon=${STAGING_DIR_NATIVE}${layout_exec_prefix} \ +EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \ --without-berkeley-db --without-apxs --without-apache \ --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ --with-apr-util=${STAGING_BINDIR_CROSS}" diff --git a/packages/subversion/subversion_1.4.0.bb b/packages/subversion/subversion_1.4.0.bb index 59f42b8c66..305b13c6a4 100644 --- a/packages/subversion/subversion_1.4.0.bb +++ b/packages/subversion/subversion_1.4.0.bb @@ -10,7 +10,7 @@ SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ file://disable-revision-install.patch;patch=1 \ file://neon-detection.patch;patch=1" -EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${TARGET_SYS} \ +EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \ --without-berkeley-db --without-apxs --without-apache \ --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ --with-apr-util=${STAGING_BINDIR_CROSS}" diff --git a/packages/subversion/subversion_1.4.3.bb b/packages/subversion/subversion_1.4.3.bb index 9674329f6c..4871674cc8 100644 --- a/packages/subversion/subversion_1.4.3.bb +++ b/packages/subversion/subversion_1.4.3.bb @@ -11,7 +11,7 @@ SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ file://disable-revision-install.patch;patch=1 \ file://neon-detection.patch;patch=1" -EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${TARGET_SYS} \ +EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \ --without-berkeley-db --without-apxs --without-apache \ --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ --with-apr-util=${STAGING_BINDIR_CROSS}" diff --git a/packages/subversion/subversion_1.4.5.bb b/packages/subversion/subversion_1.4.5.bb index 1daf45bd0c..5c15d67daf 100644 --- a/packages/subversion/subversion_1.4.5.bb +++ b/packages/subversion/subversion_1.4.5.bb @@ -11,7 +11,7 @@ SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ file://disable-revision-install.patch;patch=1 \ file://neon-detection.patch;patch=1" -EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${TARGET_SYS} \ +EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \ --without-berkeley-db --without-apxs --without-apache \ --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ --with-apr-util=${STAGING_BINDIR_CROSS}" -- cgit v1.2.3 From de888109692d3bcb8be8b1268b6b0ad15cbc9879 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 21 Feb 2008 13:19:58 +0000 Subject: asterisk: Remove hardcoded staging references --- packages/asterisk/asterisk_1.4.10.bb | 20 ++++++++++---------- packages/asterisk/asterisk_1.4.11.bb | 20 ++++++++++---------- packages/asterisk/asterisk_1.4.17.bb | 20 ++++++++++---------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/packages/asterisk/asterisk_1.4.10.bb b/packages/asterisk/asterisk_1.4.10.bb index 4110f01930..416495a0b8 100644 --- a/packages/asterisk/asterisk_1.4.10.bb +++ b/packages/asterisk/asterisk_1.4.10.bb @@ -30,17 +30,17 @@ INITSCRIPT_PARAMS = "defaults 60" inherit autotools update-rc.d -EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\ - --with-z=${STAGING_DIR}/${TARGET_SYS}\ - --with-curl=${STAGING_DIR}/${TARGET_SYS}\ - --with-termcap=${STAGING_DIR}/${TARGET_SYS}\ - --with-ogg=${STAGING_DIR}/${TARGET_SYS}\ - --with-vorbis=${STAGING_DIR}/${TARGET_SYS}\ - --with-sqlite=${STAGING_DIR}/${TARGET_SYS}\ - --with-popt=${STAGING_DIR}/${TARGET_SYS}\ - --with-gnutls=${STAGING_DIR}/${TARGET_SYS}\ +EXTRA_OECONF = "--with-ssl=${STAGING_EXECPREFIXDIR} \ + --with-z=${STAGING_EXECPREFIXDIR} \ + --with-curl=${STAGING_EXECPREFIXDIR} \ + --with-termcap=${STAGING_EXECPREFIXDIR} \ + --with-ogg=${STAGING_EXECPREFIXDIR} \ + --with-vorbis=${STAGING_EXECPREFIXDIR} \ + --with-sqlite=${STAGING_EXECPREFIXDIR} \ + --with-popt=${STAGING_EXECPREFIXDIR} \ + --with-gnutls=${STAGING_EXECPREFIXDIR} \ --without-curses\ - --with-ncurses=${STAGING_DIR}/${TARGET_SYS}\ + --with-ncurses=${STAGING_EXECPREFIXDIR} \ --without-imap\ --without-netsnmp\ --without-odbc\ diff --git a/packages/asterisk/asterisk_1.4.11.bb b/packages/asterisk/asterisk_1.4.11.bb index 0d4f30aef9..2f116864e4 100644 --- a/packages/asterisk/asterisk_1.4.11.bb +++ b/packages/asterisk/asterisk_1.4.11.bb @@ -32,17 +32,17 @@ INITSCRIPT_PARAMS = "defaults 60" inherit autotools update-rc.d -EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\ - --with-z=${STAGING_DIR}/${TARGET_SYS}\ - --with-curl=${STAGING_DIR}/${TARGET_SYS}\ - --with-termcap=${STAGING_DIR}/${TARGET_SYS}\ - --with-ogg=${STAGING_DIR}/${TARGET_SYS}\ - --with-vorbis=${STAGING_DIR}/${TARGET_SYS}\ - --with-sqlite=${STAGING_DIR}/${TARGET_SYS}\ - --with-popt=${STAGING_DIR}/${TARGET_SYS}\ - --with-gnutls=${STAGING_DIR}/${TARGET_SYS}\ +EXTRA_OECONF = "--with-ssl=${STAGING_EXECPREFIXDIR}\ + --with-z=${STAGING_EXECPREFIXDIR}\ + --with-curl=${STAGING_EXECPREFIXDIR}\ + --with-termcap=${STAGING_EXECPREFIXDIR}\ + --with-ogg=${STAGING_EXECPREFIXDIR}\ + --with-vorbis=${STAGING_EXECPREFIXDIR}\ + --with-sqlite=${STAGING_EXECPREFIXDIR}\ + --with-popt=${STAGING_EXECPREFIXDIR}\ + --with-gnutls=${STAGING_EXECPREFIXDIR}\ --without-curses\ - --with-ncurses=${STAGING_DIR}/${TARGET_SYS}\ + --with-ncurses=${STAGING_EXECPREFIXDIR}\ --without-imap\ --without-netsnmp\ --without-odbc\ diff --git a/packages/asterisk/asterisk_1.4.17.bb b/packages/asterisk/asterisk_1.4.17.bb index fb64581364..cecb403262 100644 --- a/packages/asterisk/asterisk_1.4.17.bb +++ b/packages/asterisk/asterisk_1.4.17.bb @@ -31,17 +31,17 @@ INITSCRIPT_PARAMS = "defaults 60" inherit autotools update-rc.d -EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\ - --with-z=${STAGING_DIR}/${TARGET_SYS}\ - --with-curl=${STAGING_DIR}/${TARGET_SYS}\ - --with-termcap=${STAGING_DIR}/${TARGET_SYS}\ - --with-ogg=${STAGING_DIR}/${TARGET_SYS}\ - --with-vorbis=${STAGING_DIR}/${TARGET_SYS}\ - --with-sqlite=${STAGING_DIR}/${TARGET_SYS}\ - --with-popt=${STAGING_DIR}/${TARGET_SYS}\ - --with-gnutls=${STAGING_DIR}/${TARGET_SYS}\ +EXTRA_OECONF = "--with-ssl=${STAGING_EXECPREFIXDIR} \ + --with-z=${STAGING_EXECPREFIXDIR} \ + --with-curl=${STAGING_EXECPREFIXDIR} \ + --with-termcap=${STAGING_EXECPREFIXDIR} \ + --with-ogg=${STAGING_EXECPREFIXDIR} \ + --with-vorbis=${STAGING_EXECPREFIXDIR} \ + --with-sqlite=${STAGING_EXECPREFIXDIR} \ + --with-popt=${STAGING_EXECPREFIXDIR} \ + --with-gnutls=${STAGING_EXECPREFIXDIR} \ --without-curses\ - --with-ncurses=${STAGING_DIR}/${TARGET_SYS}\ + --with-ncurses=${STAGING_EXECPREFIXDIR} \ --without-imap\ --without-netsnmp\ --without-odbc\ -- cgit v1.2.3 From d2d8d6ce29dcaf31e9945df4aa7d9e27603a1311 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 21 Feb 2008 13:21:04 +0000 Subject: libxine: Remove hardcoded staging references --- packages/libxine/libxine-fb_1.0.bb | 6 +++--- packages/libxine/libxine-x11_1.0.bb | 6 +++--- packages/libxine/libxine_1.1.0.bb | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/libxine/libxine-fb_1.0.bb b/packages/libxine/libxine-fb_1.0.bb index d0f58303fa..a51dc83896 100644 --- a/packages/libxine/libxine-fb_1.0.bb +++ b/packages/libxine/libxine-fb_1.0.bb @@ -26,10 +26,10 @@ S = "${WORKDIR}/xine-lib-${PV}" SOV = "1.0.7" -EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \ - --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \ +EXTRA_OECONF="-with-zlib-path=${STAGING_EXECPREFIXDIR} \ + --with-vorbis-prefix=${STAGING_EXECPREFIXDIR} \ --disable-oggtest \ - --with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \ + --with-ogg-prefix=${STAGING_EXECPREFIXDIR} \ --disable-altivec --disable-vis --disable-mlib \ --enable-shared --disable-static \ --disable-fb --disable-alsa --disable-vcd \ diff --git a/packages/libxine/libxine-x11_1.0.bb b/packages/libxine/libxine-x11_1.0.bb index db0d725aac..806f8fd4b7 100644 --- a/packages/libxine/libxine-x11_1.0.bb +++ b/packages/libxine/libxine-x11_1.0.bb @@ -27,10 +27,10 @@ S = "${WORKDIR}/xine-lib-${PV}" SOV = "1.0.7" -EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \ - --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \ +EXTRA_OECONF="-with-zlib-path=${STAGING_EXECPREFIXDIR} \ + --with-vorbis-prefix=${STAGING_EXECPREFIXDIR} \ --disable-oggtest \ - --with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \ + --with-ogg-prefix=${STAGING_EXECPREFIXDIR} \ --disable-altivec --disable-vis --disable-mlib \ --disable-fb --disable-alsa --disable-vcd \ --disable-asf --disable-faad --disable-iconv \ diff --git a/packages/libxine/libxine_1.1.0.bb b/packages/libxine/libxine_1.1.0.bb index 7732eb813e..9219e5fdcd 100644 --- a/packages/libxine/libxine_1.1.0.bb +++ b/packages/libxine/libxine_1.1.0.bb @@ -31,10 +31,10 @@ S = "${WORKDIR}/xine-lib-${PV}" SOV = "1.0.7" -EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \ - --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \ +EXTRA_OECONF="-with-zlib-path=${STAGING_EXECPREFIXDIR} \ + --with-vorbis-prefix=${STAGING_EXECPREFIXDIR} \ --disable-oggtest \ - --with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \ + --with-ogg-prefix=${STAGING_EXECPREFIXDIR} \ --disable-altivec --disable-vis --disable-mlib \ --disable-fb --disable-alsa --disable-vcd \ --disable-asf --disable-faad --disable-iconv \ -- cgit v1.2.3 From 82f966b8c7ef4214975b5abd171d0bccc870ea1a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 21 Feb 2008 13:22:10 +0000 Subject: rdesktop, elf2flt, primstumbler, xmms-embedded: Remove hardcoded staging references --- packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb | 6 +++--- packages/prismstumbler/prismstumbler_0.7.3.bb | 2 +- packages/rdesktop/rdesktop_1.3.1.bb | 4 ++-- packages/rdesktop/rdesktop_1.4.1.bb | 2 +- packages/rdesktop/rdesktop_1.5.0.bb | 2 +- packages/uclibc/elf2flt_svn.bb | 6 +++--- packages/xmms-embedded/xmms-embedded_20040327.bb | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb b/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb index 7b60122445..22309f9203 100644 --- a/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb +++ b/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb @@ -20,12 +20,12 @@ inherit autotools pkgconfig EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ - --with-libgps=${STAGING_DIR}/${HOST_SYS} \ - --with-libpcap=${STAGING_DIR}/${HOST_SYS} \ + --with-libgps=${STAGING_EXECPREFIXDIR} \ + --with-libpcap=${STAGING_EXECPREFIXDIR} \ --with-sqlite-includes=${STAGING_INCDIR} \ --with-sqlite-libs=${STAGING_LIBDIR} \ --without-athena --enable-dbus \ - --with-libiw=${STAGING_DIR}/${HOST_SYS}" + --with-libiw=${STAGING_EXECPREFIXDIR}" CFLAGS =+ "-I${S}/include" LDFLAGS += "-lz" diff --git a/packages/prismstumbler/prismstumbler_0.7.3.bb b/packages/prismstumbler/prismstumbler_0.7.3.bb index 29a112d95a..5bddcf31b6 100644 --- a/packages/prismstumbler/prismstumbler_0.7.3.bb +++ b/packages/prismstumbler/prismstumbler_0.7.3.bb @@ -17,7 +17,7 @@ inherit autotools pkgconfig EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ - --with-libpcap=${STAGING_DIR}/${HOST_SYS} \ + --with-libpcap=${STAGING_EXECPREFIXDIR} \ --with-sqlite-includes=${STAGING_INCDIR} \ --with-sqlite-libs=${STAGING_LIBDIR} \ --without-athena \ diff --git a/packages/rdesktop/rdesktop_1.3.1.bb b/packages/rdesktop/rdesktop_1.3.1.bb index 12ff1c5bcd..f54c675314 100644 --- a/packages/rdesktop/rdesktop_1.3.1.bb +++ b/packages/rdesktop/rdesktop_1.3.1.bb @@ -22,8 +22,8 @@ do_configure() { --bindir=${bindir} \ --mandir=${mandir} \ --sharedir=${datadir} \ - --with-x=${STAGING_DIR}/${HOST_SYS} \ - --with-openssl=${STAGING_DIR}/${HOST_SYS} \ + --with-x=${STAGING_EXECPREFIXDIR} \ + --with-openssl=${STAGING_EXECPREFIXDIR} \ --with-oss \ --without-debug } diff --git a/packages/rdesktop/rdesktop_1.4.1.bb b/packages/rdesktop/rdesktop_1.4.1.bb index 7581647a57..da1794b190 100644 --- a/packages/rdesktop/rdesktop_1.4.1.bb +++ b/packages/rdesktop/rdesktop_1.4.1.bb @@ -11,4 +11,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz \ inherit autotools -EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. " +EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} " diff --git a/packages/rdesktop/rdesktop_1.5.0.bb b/packages/rdesktop/rdesktop_1.5.0.bb index de270e1025..12385c127f 100644 --- a/packages/rdesktop/rdesktop_1.5.0.bb +++ b/packages/rdesktop/rdesktop_1.5.0.bb @@ -10,4 +10,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz" inherit autotools -EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. " +EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} " diff --git a/packages/uclibc/elf2flt_svn.bb b/packages/uclibc/elf2flt_svn.bb index 0fac49d468..3af893a7a8 100644 --- a/packages/uclibc/elf2flt_svn.bb +++ b/packages/uclibc/elf2flt_svn.bb @@ -9,7 +9,7 @@ SRC_URI = "svn://sources.blackfin.uclinux.org/toolchain/trunk;module=${PN}" S = "${WORKDIR}/${PN}" -EXTRA_OECONF = " --with-libbfd=${STAGING_DIR}/${TARGET_SYS}/lib/libbfd.a \ - --with-libiberty=${STAGING_DIR}/${TARGET_SYS}/lib/libiberty.a \ - --with-bfd-include-dir=${STAGING_DIR}/${TARGET_SYS}/include \ +EXTRA_OECONF = " --with-libbfd=${STAGING_LIBDIR}/libbfd.a \ + --with-libiberty=${STAGING_LIBDIR}/libiberty.a \ + --with-bfd-include-dir=${STAGING_INCDIR} \ " diff --git a/packages/xmms-embedded/xmms-embedded_20040327.bb b/packages/xmms-embedded/xmms-embedded_20040327.bb index c525f6299c..4d5ea6a12b 100644 --- a/packages/xmms-embedded/xmms-embedded_20040327.bb +++ b/packages/xmms-embedded/xmms-embedded_20040327.bb @@ -31,7 +31,7 @@ do_configure_prepend() { } do_compile() { - oe_runmake "STAGING_DIR=${STAGING_DIR}/${HOST_SYS}" + oe_runmake "STAGING_DIR=${STAGING_EXECPREFIXDIR}" } do_install() { -- cgit v1.2.3 From 5f80772db194135a8817add109762e7e96ee75f2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 21 Feb 2008 13:33:35 +0000 Subject: Move various X extensions to obsolete since they've been superceeded by *proto in X11R7.X --- packages/compositeext/.mtn2git_empty | 0 packages/compositeext/compositeext_2.0.bb | 16 ------------- packages/compositeext/compositeext_cvs.bb | 19 --------------- packages/damageext/.mtn2git_empty | 0 packages/damageext/damageext-1.0/.mtn2git_empty | 0 packages/damageext/damageext-1.0/autofoo.patch | 18 -------------- packages/damageext/damageext_1.0.bb | 18 -------------- packages/damageext/damageext_cvs.bb | 19 --------------- packages/damageext/files/.mtn2git_empty | 0 packages/damageext/files/autofoo.patch | 28 ---------------------- packages/fixesext/.mtn2git_empty | 0 packages/fixesext/fixesext_2.0.1.bb | 16 ------------- packages/fixesext/fixesext_cvs.bb | 19 --------------- packages/obsolete/compositeext/.mtn2git_empty | 0 packages/obsolete/compositeext/compositeext_2.0.bb | 16 +++++++++++++ packages/obsolete/compositeext/compositeext_cvs.bb | 19 +++++++++++++++ packages/obsolete/damageext/.mtn2git_empty | 0 .../damageext/damageext-1.0/.mtn2git_empty | 0 .../obsolete/damageext/damageext-1.0/autofoo.patch | 18 ++++++++++++++ packages/obsolete/damageext/damageext_1.0.bb | 18 ++++++++++++++ packages/obsolete/damageext/damageext_cvs.bb | 19 +++++++++++++++ packages/obsolete/damageext/files/.mtn2git_empty | 0 packages/obsolete/damageext/files/autofoo.patch | 28 ++++++++++++++++++++++ packages/obsolete/fixesext/.mtn2git_empty | 0 packages/obsolete/fixesext/fixesext_2.0.1.bb | 16 +++++++++++++ packages/obsolete/fixesext/fixesext_cvs.bb | 19 +++++++++++++++ packages/obsolete/panoramixext/.mtn2git_empty | 0 packages/obsolete/panoramixext/panoramixext_1.1.bb | 17 +++++++++++++ packages/obsolete/panoramixext/panoramixext_cvs.bb | 19 +++++++++++++++ packages/obsolete/resourceext/.mtn2git_empty | 0 packages/obsolete/resourceext/resourceext_1.0.bb | 16 +++++++++++++ packages/obsolete/resourceext/resourceext_cvs.bb | 18 ++++++++++++++ packages/obsolete/xxf86dgaext/.mtn2git_empty | 0 packages/obsolete/xxf86dgaext/xxf86dgaext_cvs.bb | 13 ++++++++++ packages/obsolete/xxf86vmext/.mtn2git_empty | 0 packages/obsolete/xxf86vmext/xxf86vmext_cvs.bb | 13 ++++++++++ packages/panoramixext/.mtn2git_empty | 0 packages/panoramixext/panoramixext_1.1.bb | 17 ------------- packages/panoramixext/panoramixext_cvs.bb | 19 --------------- packages/resourceext/.mtn2git_empty | 0 packages/resourceext/resourceext_1.0.bb | 16 ------------- packages/resourceext/resourceext_cvs.bb | 18 -------------- packages/xxf86dgaext/.mtn2git_empty | 0 packages/xxf86dgaext/xxf86dgaext_cvs.bb | 13 ---------- packages/xxf86vmext/.mtn2git_empty | 0 packages/xxf86vmext/xxf86vmext_cvs.bb | 13 ---------- 46 files changed, 249 insertions(+), 249 deletions(-) delete mode 100644 packages/compositeext/.mtn2git_empty delete mode 100644 packages/compositeext/compositeext_2.0.bb delete mode 100644 packages/compositeext/compositeext_cvs.bb delete mode 100644 packages/damageext/.mtn2git_empty delete mode 100644 packages/damageext/damageext-1.0/.mtn2git_empty delete mode 100644 packages/damageext/damageext-1.0/autofoo.patch delete mode 100644 packages/damageext/damageext_1.0.bb delete mode 100644 packages/damageext/damageext_cvs.bb delete mode 100644 packages/damageext/files/.mtn2git_empty delete mode 100644 packages/damageext/files/autofoo.patch delete mode 100644 packages/fixesext/.mtn2git_empty delete mode 100644 packages/fixesext/fixesext_2.0.1.bb delete mode 100644 packages/fixesext/fixesext_cvs.bb create mode 100644 packages/obsolete/compositeext/.mtn2git_empty create mode 100644 packages/obsolete/compositeext/compositeext_2.0.bb create mode 100644 packages/obsolete/compositeext/compositeext_cvs.bb create mode 100644 packages/obsolete/damageext/.mtn2git_empty create mode 100644 packages/obsolete/damageext/damageext-1.0/.mtn2git_empty create mode 100644 packages/obsolete/damageext/damageext-1.0/autofoo.patch create mode 100644 packages/obsolete/damageext/damageext_1.0.bb create mode 100644 packages/obsolete/damageext/damageext_cvs.bb create mode 100644 packages/obsolete/damageext/files/.mtn2git_empty create mode 100644 packages/obsolete/damageext/files/autofoo.patch create mode 100644 packages/obsolete/fixesext/.mtn2git_empty create mode 100644 packages/obsolete/fixesext/fixesext_2.0.1.bb create mode 100644 packages/obsolete/fixesext/fixesext_cvs.bb create mode 100644 packages/obsolete/panoramixext/.mtn2git_empty create mode 100644 packages/obsolete/panoramixext/panoramixext_1.1.bb create mode 100644 packages/obsolete/panoramixext/panoramixext_cvs.bb create mode 100644 packages/obsolete/resourceext/.mtn2git_empty create mode 100644 packages/obsolete/resourceext/resourceext_1.0.bb create mode 100644 packages/obsolete/resourceext/resourceext_cvs.bb create mode 100644 packages/obsolete/xxf86dgaext/.mtn2git_empty create mode 100644 packages/obsolete/xxf86dgaext/xxf86dgaext_cvs.bb create mode 100644 packages/obsolete/xxf86vmext/.mtn2git_empty create mode 100644 packages/obsolete/xxf86vmext/xxf86vmext_cvs.bb delete mode 100644 packages/panoramixext/.mtn2git_empty delete mode 100644 packages/panoramixext/panoramixext_1.1.bb delete mode 100644 packages/panoramixext/panoramixext_cvs.bb delete mode 100644 packages/resourceext/.mtn2git_empty delete mode 100644 packages/resourceext/resourceext_1.0.bb delete mode 100644 packages/resourceext/resourceext_cvs.bb delete mode 100644 packages/xxf86dgaext/.mtn2git_empty delete mode 100644 packages/xxf86dgaext/xxf86dgaext_cvs.bb delete mode 100644 packages/xxf86vmext/.mtn2git_empty delete mode 100644 packages/xxf86vmext/xxf86vmext_cvs.bb diff --git a/packages/compositeext/.mtn2git_empty b/packages/compositeext/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/compositeext/compositeext_2.0.bb b/packages/compositeext/compositeext_2.0.bb deleted file mode 100644 index b9b634d391..0000000000 --- a/packages/compositeext/compositeext_2.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -SECTION = "libs" -LICENSE= "BSD-X" -DEPENDS = "xextensions fixesext" -DESCRIPTION = "X Composite extension headers and specification" - -SRC_URI = "${XLIBS_MIRROR}/compositeext-${PV}.tar.bz2" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/packages/compositeext/compositeext_cvs.bb b/packages/compositeext/compositeext_cvs.bb deleted file mode 100644 index 8f0f4f9f46..0000000000 --- a/packages/compositeext/compositeext_cvs.bb +++ /dev/null @@ -1,19 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE= "BSD-X" -SECTION = "libs" -DEPENDS = "xextensions fixesext" -DESCRIPTION = "X Composite extension headers and specification" -DEFAULT_PREFERENCE = "1" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=CompositeExt" -S = "${WORKDIR}/CompositeExt" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/packages/damageext/.mtn2git_empty b/packages/damageext/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/damageext/damageext-1.0/.mtn2git_empty b/packages/damageext/damageext-1.0/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/damageext/damageext-1.0/autofoo.patch b/packages/damageext/damageext-1.0/autofoo.patch deleted file mode 100644 index e36fb1d74b..0000000000 --- a/packages/damageext/damageext-1.0/autofoo.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- damageext-1.0/configure.ac~autofoo 2003-11-25 22:47:58.000000000 -0500 -+++ damageext-1.0/configure.ac 2005-01-16 11:47:08.123775952 -0500 -@@ -25,9 +25,9 @@ - - AC_PREREQ([2.57]) - AC_INIT([damageext], [1.0], [keithp@keithp.com], damageext) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE --AC_CONFIG_AUX_DIR(.) - - PKG_CHECK_MODULES(FIXESEXT, fixesext) - diff --git a/packages/damageext/damageext_1.0.bb b/packages/damageext/damageext_1.0.bb deleted file mode 100644 index 3b431a8688..0000000000 --- a/packages/damageext/damageext_1.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "libs" -LICENSE = "MIT-X" -DEPENDS = "xextensions fixesext" -DESCRIPTION = "X Damage extension headers and specification" -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/damageext-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/packages/damageext/damageext_cvs.bb b/packages/damageext/damageext_cvs.bb deleted file mode 100644 index e9ffa7d2b1..0000000000 --- a/packages/damageext/damageext_cvs.bb +++ /dev/null @@ -1,19 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "MIT-X" -SECTION = "libs" -DEPENDS = "xextensions fixesext" -DESCRIPTION = "X Damage extension headers and specification" -PR = "r1" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=DamageExt" -S = "${WORKDIR}/DamageExt" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/packages/damageext/files/.mtn2git_empty b/packages/damageext/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/damageext/files/autofoo.patch b/packages/damageext/files/autofoo.patch deleted file mode 100644 index 48c05cd836..0000000000 --- a/packages/damageext/files/autofoo.patch +++ /dev/null @@ -1,28 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- DamageExt/configure.ac~autofoo.patch 2003-11-25 22:47:58.000000000 -0500 -+++ DamageExt/configure.ac 2005-01-16 11:50:07.183554728 -0500 -@@ -25,9 +25,9 @@ - - AC_PREREQ([2.57]) - AC_INIT([damageext], [1.0], [keithp@keithp.com], damageext) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE --AC_CONFIG_AUX_DIR(.) - - PKG_CHECK_MODULES(FIXESEXT, fixesext) - ---- DamageExt/ChangeLog~autofoo.patch 2004-02-03 15:44:42.000000000 -0500 -+++ DamageExt/ChangeLog 2005-01-16 11:52:45.455493736 -0500 -@@ -1,3 +1,7 @@ -+2005-01-16 Chris Larson -+ -+ * configure.ac: Fix to work with automake 1.9.x. -+ - 2004-02-03 Jim Gettys - - * AUTHORS: Add AUTHORS to file diff --git a/packages/fixesext/.mtn2git_empty b/packages/fixesext/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/fixesext/fixesext_2.0.1.bb b/packages/fixesext/fixesext_2.0.1.bb deleted file mode 100644 index feb53d60eb..0000000000 --- a/packages/fixesext/fixesext_2.0.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -SECTION = "libs" -LICENSE= "BSD-X" -DEPENDS = "xextensions" -DESCRIPTION = "X Fixes extension headers and specification." - -SRC_URI = "${XLIBS_MIRROR}/fixesext-${PV}.tar.bz2" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/packages/fixesext/fixesext_cvs.bb b/packages/fixesext/fixesext_cvs.bb deleted file mode 100644 index 4ddbc96c64..0000000000 --- a/packages/fixesext/fixesext_cvs.bb +++ /dev/null @@ -1,19 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE= "BSD-X" -SECTION = "libs" -DEPENDS = "xextensions" -DESCRIPTION = "X Fixes extension headers and specification." -DEFAULT_PREFERENCE = "1" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=FixesExt" -S = "${WORKDIR}/FixesExt" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/packages/obsolete/compositeext/.mtn2git_empty b/packages/obsolete/compositeext/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/obsolete/compositeext/compositeext_2.0.bb b/packages/obsolete/compositeext/compositeext_2.0.bb new file mode 100644 index 0000000000..b9b634d391 --- /dev/null +++ b/packages/obsolete/compositeext/compositeext_2.0.bb @@ -0,0 +1,16 @@ +SECTION = "libs" +LICENSE= "BSD-X" +DEPENDS = "xextensions fixesext" +DESCRIPTION = "X Composite extension headers and specification" + +SRC_URI = "${XLIBS_MIRROR}/compositeext-${PV}.tar.bz2" + +inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/obsolete/compositeext/compositeext_cvs.bb b/packages/obsolete/compositeext/compositeext_cvs.bb new file mode 100644 index 0000000000..8f0f4f9f46 --- /dev/null +++ b/packages/obsolete/compositeext/compositeext_cvs.bb @@ -0,0 +1,19 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE= "BSD-X" +SECTION = "libs" +DEPENDS = "xextensions fixesext" +DESCRIPTION = "X Composite extension headers and specification" +DEFAULT_PREFERENCE = "1" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=CompositeExt" +S = "${WORKDIR}/CompositeExt" + +inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/obsolete/damageext/.mtn2git_empty b/packages/obsolete/damageext/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/obsolete/damageext/damageext-1.0/.mtn2git_empty b/packages/obsolete/damageext/damageext-1.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/obsolete/damageext/damageext-1.0/autofoo.patch b/packages/obsolete/damageext/damageext-1.0/autofoo.patch new file mode 100644 index 0000000000..e36fb1d74b --- /dev/null +++ b/packages/obsolete/damageext/damageext-1.0/autofoo.patch @@ -0,0 +1,18 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- damageext-1.0/configure.ac~autofoo 2003-11-25 22:47:58.000000000 -0500 ++++ damageext-1.0/configure.ac 2005-01-16 11:47:08.123775952 -0500 +@@ -25,9 +25,9 @@ + + AC_PREREQ([2.57]) + AC_INIT([damageext], [1.0], [keithp@keithp.com], damageext) ++AC_CONFIG_AUX_DIR(.) + AM_INIT_AUTOMAKE([dist-bzip2]) + AM_MAINTAINER_MODE +-AC_CONFIG_AUX_DIR(.) + + PKG_CHECK_MODULES(FIXESEXT, fixesext) + diff --git a/packages/obsolete/damageext/damageext_1.0.bb b/packages/obsolete/damageext/damageext_1.0.bb new file mode 100644 index 0000000000..3b431a8688 --- /dev/null +++ b/packages/obsolete/damageext/damageext_1.0.bb @@ -0,0 +1,18 @@ +SECTION = "libs" +LICENSE = "MIT-X" +DEPENDS = "xextensions fixesext" +DESCRIPTION = "X Damage extension headers and specification" +PR = "r1" + +SRC_URI = "${XLIBS_MIRROR}/damageext-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" + +inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/obsolete/damageext/damageext_cvs.bb b/packages/obsolete/damageext/damageext_cvs.bb new file mode 100644 index 0000000000..e9ffa7d2b1 --- /dev/null +++ b/packages/obsolete/damageext/damageext_cvs.bb @@ -0,0 +1,19 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE = "MIT-X" +SECTION = "libs" +DEPENDS = "xextensions fixesext" +DESCRIPTION = "X Damage extension headers and specification" +PR = "r1" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=DamageExt" +S = "${WORKDIR}/DamageExt" + +inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/obsolete/damageext/files/.mtn2git_empty b/packages/obsolete/damageext/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/obsolete/damageext/files/autofoo.patch b/packages/obsolete/damageext/files/autofoo.patch new file mode 100644 index 0000000000..48c05cd836 --- /dev/null +++ b/packages/obsolete/damageext/files/autofoo.patch @@ -0,0 +1,28 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- DamageExt/configure.ac~autofoo.patch 2003-11-25 22:47:58.000000000 -0500 ++++ DamageExt/configure.ac 2005-01-16 11:50:07.183554728 -0500 +@@ -25,9 +25,9 @@ + + AC_PREREQ([2.57]) + AC_INIT([damageext], [1.0], [keithp@keithp.com], damageext) ++AC_CONFIG_AUX_DIR(.) + AM_INIT_AUTOMAKE([dist-bzip2]) + AM_MAINTAINER_MODE +-AC_CONFIG_AUX_DIR(.) + + PKG_CHECK_MODULES(FIXESEXT, fixesext) + +--- DamageExt/ChangeLog~autofoo.patch 2004-02-03 15:44:42.000000000 -0500 ++++ DamageExt/ChangeLog 2005-01-16 11:52:45.455493736 -0500 +@@ -1,3 +1,7 @@ ++2005-01-16 Chris Larson ++ ++ * configure.ac: Fix to work with automake 1.9.x. ++ + 2004-02-03 Jim Gettys + + * AUTHORS: Add AUTHORS to file diff --git a/packages/obsolete/fixesext/.mtn2git_empty b/packages/obsolete/fixesext/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/obsolete/fixesext/fixesext_2.0.1.bb b/packages/obsolete/fixesext/fixesext_2.0.1.bb new file mode 100644 index 0000000000..feb53d60eb --- /dev/null +++ b/packages/obsolete/fixesext/fixesext_2.0.1.bb @@ -0,0 +1,16 @@ +SECTION = "libs" +LICENSE= "BSD-X" +DEPENDS = "xextensions" +DESCRIPTION = "X Fixes extension headers and specification." + +SRC_URI = "${XLIBS_MIRROR}/fixesext-${PV}.tar.bz2" + +inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/obsolete/fixesext/fixesext_cvs.bb b/packages/obsolete/fixesext/fixesext_cvs.bb new file mode 100644 index 0000000000..4ddbc96c64 --- /dev/null +++ b/packages/obsolete/fixesext/fixesext_cvs.bb @@ -0,0 +1,19 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE= "BSD-X" +SECTION = "libs" +DEPENDS = "xextensions" +DESCRIPTION = "X Fixes extension headers and specification." +DEFAULT_PREFERENCE = "1" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=FixesExt" +S = "${WORKDIR}/FixesExt" + +inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/obsolete/panoramixext/.mtn2git_empty b/packages/obsolete/panoramixext/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/obsolete/panoramixext/panoramixext_1.1.bb b/packages/obsolete/panoramixext/panoramixext_1.1.bb new file mode 100644 index 0000000000..2da504779f --- /dev/null +++ b/packages/obsolete/panoramixext/panoramixext_1.1.bb @@ -0,0 +1,17 @@ +SECTION = "libs" +LICENSE= "MIT" +PRIORITY = "optional" +DESCRIPTION = "PanoramiX extension headers" + +SRC_URI = "${XLIBS_MIRROR}/panoramixext-${PV}.tar.bz2" + +inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} \ + mandir=${STAGING_DIR}/man +} diff --git a/packages/obsolete/panoramixext/panoramixext_cvs.bb b/packages/obsolete/panoramixext/panoramixext_cvs.bb new file mode 100644 index 0000000000..08cc0cc51e --- /dev/null +++ b/packages/obsolete/panoramixext/panoramixext_cvs.bb @@ -0,0 +1,19 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE= "MIT" +SECTION = "libs" +PRIORITY = "optional" +DESCRIPTION = "PanoramiX extension headers" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=PanoramiXExt" +S = "${WORKDIR}/PanoramiXExt" + +inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} \ + mandir=${STAGING_DIR}/man +} diff --git a/packages/obsolete/resourceext/.mtn2git_empty b/packages/obsolete/resourceext/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/obsolete/resourceext/resourceext_1.0.bb b/packages/obsolete/resourceext/resourceext_1.0.bb new file mode 100644 index 0000000000..55780b1d22 --- /dev/null +++ b/packages/obsolete/resourceext/resourceext_1.0.bb @@ -0,0 +1,16 @@ +SECTION = "libs" +LICENSE = "Xorg" +DEPENDS = "xextensions" +DESCRIPTION = "X Resource usage extension headers" + +SRC_URI = "${XLIBS_MIRROR}/resourceext-${PV}.tar.bz2" + +inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/obsolete/resourceext/resourceext_cvs.bb b/packages/obsolete/resourceext/resourceext_cvs.bb new file mode 100644 index 0000000000..b0fe23392e --- /dev/null +++ b/packages/obsolete/resourceext/resourceext_cvs.bb @@ -0,0 +1,18 @@ +PV = "0.0+cvs${SRCDATE}" +SECTION = "libs" +LICENSE = "Xorg" +DEPENDS = "xextensions" +DESCRIPTION = "X Resource usage extension headers" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=ResourceExt" +S = "${WORKDIR}/ResourceExt" + +inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/obsolete/xxf86dgaext/.mtn2git_empty b/packages/obsolete/xxf86dgaext/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/obsolete/xxf86dgaext/xxf86dgaext_cvs.bb b/packages/obsolete/xxf86dgaext/xxf86dgaext_cvs.bb new file mode 100644 index 0000000000..30788049c7 --- /dev/null +++ b/packages/obsolete/xxf86dgaext/xxf86dgaext_cvs.bb @@ -0,0 +1,13 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE = "Xorg" +SECTION = "x11/libs" +DESCRIPTION = "Xxf86dga extension headers" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XF86DGAExt" +S = "${WORKDIR}/XF86DGAExt" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/obsolete/xxf86vmext/.mtn2git_empty b/packages/obsolete/xxf86vmext/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/obsolete/xxf86vmext/xxf86vmext_cvs.bb b/packages/obsolete/xxf86vmext/xxf86vmext_cvs.bb new file mode 100644 index 0000000000..06145e2905 --- /dev/null +++ b/packages/obsolete/xxf86vmext/xxf86vmext_cvs.bb @@ -0,0 +1,13 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE = "MIT" +SECTION = "x11/libs" +DESCRIPTION = "Xxf86vm extension headers" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XF86VMExt" +S = "${WORKDIR}/XF86VMExt" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/panoramixext/.mtn2git_empty b/packages/panoramixext/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/panoramixext/panoramixext_1.1.bb b/packages/panoramixext/panoramixext_1.1.bb deleted file mode 100644 index 2da504779f..0000000000 --- a/packages/panoramixext/panoramixext_1.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -SECTION = "libs" -LICENSE= "MIT" -PRIORITY = "optional" -DESCRIPTION = "PanoramiX extension headers" - -SRC_URI = "${XLIBS_MIRROR}/panoramixext-${PV}.tar.bz2" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DIR}/man -} diff --git a/packages/panoramixext/panoramixext_cvs.bb b/packages/panoramixext/panoramixext_cvs.bb deleted file mode 100644 index 08cc0cc51e..0000000000 --- a/packages/panoramixext/panoramixext_cvs.bb +++ /dev/null @@ -1,19 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE= "MIT" -SECTION = "libs" -PRIORITY = "optional" -DESCRIPTION = "PanoramiX extension headers" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=PanoramiXExt" -S = "${WORKDIR}/PanoramiXExt" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DIR}/man -} diff --git a/packages/resourceext/.mtn2git_empty b/packages/resourceext/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/resourceext/resourceext_1.0.bb b/packages/resourceext/resourceext_1.0.bb deleted file mode 100644 index 55780b1d22..0000000000 --- a/packages/resourceext/resourceext_1.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -SECTION = "libs" -LICENSE = "Xorg" -DEPENDS = "xextensions" -DESCRIPTION = "X Resource usage extension headers" - -SRC_URI = "${XLIBS_MIRROR}/resourceext-${PV}.tar.bz2" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/packages/resourceext/resourceext_cvs.bb b/packages/resourceext/resourceext_cvs.bb deleted file mode 100644 index b0fe23392e..0000000000 --- a/packages/resourceext/resourceext_cvs.bb +++ /dev/null @@ -1,18 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -SECTION = "libs" -LICENSE = "Xorg" -DEPENDS = "xextensions" -DESCRIPTION = "X Resource usage extension headers" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=ResourceExt" -S = "${WORKDIR}/ResourceExt" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/packages/xxf86dgaext/.mtn2git_empty b/packages/xxf86dgaext/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xxf86dgaext/xxf86dgaext_cvs.bb b/packages/xxf86dgaext/xxf86dgaext_cvs.bb deleted file mode 100644 index 30788049c7..0000000000 --- a/packages/xxf86dgaext/xxf86dgaext_cvs.bb +++ /dev/null @@ -1,13 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "Xorg" -SECTION = "x11/libs" -DESCRIPTION = "Xxf86dga extension headers" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XF86DGAExt" -S = "${WORKDIR}/XF86DGAExt" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xxf86vmext/.mtn2git_empty b/packages/xxf86vmext/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xxf86vmext/xxf86vmext_cvs.bb b/packages/xxf86vmext/xxf86vmext_cvs.bb deleted file mode 100644 index 06145e2905..0000000000 --- a/packages/xxf86vmext/xxf86vmext_cvs.bb +++ /dev/null @@ -1,13 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "MIT" -SECTION = "x11/libs" -DESCRIPTION = "Xxf86vm extension headers" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XF86VMExt" -S = "${WORKDIR}/XF86VMExt" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} -- cgit v1.2.3 From ac78e1a06bcc2517a849fa43568e82bbda903fe4 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 21 Feb 2008 13:44:31 +0000 Subject: sane-srcrevs.inc: add SRCREV for u-boot-openmoko and restore alphabetical sort obviously it seems to be very hard to sort... guys, please consult your ASCII tables... --- conf/distro/include/sane-srcrevs.inc | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 3784303d19..34c0717543 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -7,6 +7,10 @@ # this is alphabetical! +# yes, really! + +# you know what that means? like... a, b, c, d, e, f, g... + SRCREV_pn-aircrack-ng ?= "802" SRCREV_pn-bfin-uclibc ?= "1857" SRCREV_pn-contact ?= "1410" @@ -41,6 +45,7 @@ SRCREV_pn-libmokogsmd2 ?= "3663" SRCREV_pn-libmokojournal2 ?= "3217" SRCREV_pn-libmokopanelui2 ?= "3349" SRCREV_pn-libmokoui2 ?= "3688" +SRCREV_pn-libw100 ?= "47" SRCREV_pn-libowl ?= "277" SRCREV_pn-libxosd ?= "627" SRCREV_pn-lightmediascanner ?= "68" @@ -57,7 +62,10 @@ SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739" SRCREV_pn-matchbox-panel-2 ?= "1626" SRCREV_pn-moko-gtk-engine ?= "3405" SRCREV_pn-mpd-alsa ?= "6952" +SRCREV_pn-mplayer ?= "24587" SRCREV_pn-neod ?= "3421" +SRCREV_pn-networkmanager ?= "2887" +SRCREV_pn-networkmanager-applet ?= "200" SRCREV_pn-oh-puzzles ?= "22" SRCREV_pn-osb-browser ?= "125" SRCREV_pn-osb-jscore ?= "117" @@ -132,14 +140,12 @@ SRCREV_pn-settings-daemon ?= "1755" SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "45" SRCREV_pn-tmut ?= "60" +SRCREV_pn-u-boot-openmoko ?= "4100" +SRCREV_pn-usbpath ?= "3108" +SRCREV_pn-usbpath-native ?= "3108" SRCREV_pn-webkit-gtk ?= "28656" SRCREV_pn-webkit-qt ?= "28656" SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wesnoth ?= "22021" SRCREV_pn-xoo ?= "1623" -SRCREV_pn-mplayer ?= "24587" -SRCREV_pn-networkmanager ?= "2887" -SRCREV_pn-networkmanager-applet ?= "200" -SRCREV_pn-libw100 ?= "47" -SRCREV_pn-usbpath ?= "3108" -SRCREV_pn-usbpath-native ?= "3108" + -- cgit v1.2.3 From b8d4af8ad68ef847d381259b8e8c25a998a6b88b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 21 Feb 2008 13:45:08 +0000 Subject: u-boot-openmoko svn update the blessed GIT rev --- packages/u-boot/u-boot-openmoko_svn.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/u-boot/u-boot-openmoko_svn.bb b/packages/u-boot/u-boot-openmoko_svn.bb index 3ec97f2a77..ca21f54f8a 100644 --- a/packages/u-boot/u-boot-openmoko_svn.bb +++ b/packages/u-boot/u-boot-openmoko_svn.bb @@ -14,8 +14,11 @@ UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v1 gta02v2 gta02v3 gta02v4" DEFAULT_PREFERENCE = "-1" +BLESSED_GIT_REV = "928d1d77f8623c120d8763e20e1ca58df9c5c4c6" + SRC_URI = "\ - git://www.denx.de/git/u-boot.git/;protocol=git;name=upstream;tag=3afac79ec27b91df185f090b31dad9620779f440 \ + +git://www.denx.de/git/u-boot.git/;protocol=git;name=upstream;tag=${BLESSED_GIT_REV} \ svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http;name=patches \ file://uboot-eabi-fix-HACK.patch;patch=1;maxrev=3773 \ file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \ -- cgit v1.2.3 From fc8bb1b8fad9b45a31b5b1081fb6c8a67d0654db Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 21 Feb 2008 15:10:44 +0000 Subject: firefox all use autotools_do_stage to populate staging this is needed to compile plugins against firefox. closes #1612 --- packages/mozilla/firefox.inc | 9 +++++++++ packages/mozilla/firefox_1.0.7.bb | 9 ++++----- packages/mozilla/firefox_2.0.0.3.bb | 26 ++++++++++++-------------- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/packages/mozilla/firefox.inc b/packages/mozilla/firefox.inc index bd0322334d..f5e020dc68 100644 --- a/packages/mozilla/firefox.inc +++ b/packages/mozilla/firefox.inc @@ -1,4 +1,5 @@ SRC_URI += "file://mozilla-firefox.png file://mozilla-firefox.desktop" + PACKAGES =+ "firefox-inspector" FILES_firefox-inspector = " ${libdir}/firefox-${PV}/chrome/inspector* \ @@ -27,3 +28,11 @@ pkg_postinst_firefox() { # work around requirement for root access on first startup chmod -R a+w ${libdir}/firefox* } + +do_stage() { + autotools_stage_all + + + +} + diff --git a/packages/mozilla/firefox_1.0.7.bb b/packages/mozilla/firefox_1.0.7.bb index dd4d734f89..b82dbda91e 100644 --- a/packages/mozilla/firefox_1.0.7.bb +++ b/packages/mozilla/firefox_1.0.7.bb @@ -1,4 +1,5 @@ -PR = "r0" +PR = "r2" + SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ file://xptcstubs.patch;patch=1 \ file://no-xmb.patch;patch=1 \ @@ -8,11 +9,10 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/ file://firefox-1.0-gcc4-compile.patch;patch=1;pnum=0 \ file://xptcinvoke-arm.patch;patch=1 \ file://mozilla-eabi.patch;patch=1" - S = "${WORKDIR}/mozilla" -inherit mozilla - +inherit autotools mozilla + require firefox.inc EXTRA_OECONF += " --with-gssapi=${STAGINGLIBDIR}/../" @@ -20,4 +20,3 @@ EXTRA_OECONF += " --with-gssapi=${STAGINGLIBDIR}/../" do_compile_prepend() { cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ } - diff --git a/packages/mozilla/firefox_2.0.0.3.bb b/packages/mozilla/firefox_2.0.0.3.bb index e1fb5a996d..72c42bc074 100644 --- a/packages/mozilla/firefox_2.0.0.3.bb +++ b/packages/mozilla/firefox_2.0.0.3.bb @@ -6,38 +6,36 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/ file://no-xmb.patch;patch=1 \ file://jsautocfg.h \ file://extensions-hack.patch;patch=1 \ - file://security-cross.patch;patch=1 \ - file://jsautocfg-dontoverwrite.patch;patch=1 \ - file://xptcinvoke-arm.patch;patch=1 \ - file://eabi-fix.patch;patch=1 \ - file://eabi-fix2.patch;patch=1 \ - file://eabi-fix3.patch;patch=1 \ - file://linkage-problem.patch;patch=1 \ - " + file://security-cross.patch;patch=1 \ + file://jsautocfg-dontoverwrite.patch;patch=1 \ + file://xptcinvoke-arm.patch;patch=1 \ + file://eabi-fix.patch;patch=1 \ + file://eabi-fix2.patch;patch=1 \ + file://eabi-fix3.patch;patch=1 \ + file://linkage-problem.patch;patch=1 \ +" S = "${WORKDIR}/mozilla" DEFAULT_PREFERENCE = "-1" inherit mozilla - require firefox.inc do_compile_prepend() { cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ - sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk } do_stage() { - - install -d ${STAGING_INCDIR}/${P} + install -d ${STAGING_INCDIR}/firefox-${PV} cd dist/sdk/include + rm -rf obsolete headers=`find . -name "*.h"` for f in $headers do - install -D -m 0644 $f ${STAGING_INCDIR}/${P}/$f + install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/ done # removes 2 lines that call absent headers - sed -e '178,179d' ${STAGING_INCDIR}/${P}/nsIServiceManager.h + sed -e '178,179d' ${STAGING_INCDIR}/firefox-${PV}/nsIServiceManager.h } -- cgit v1.2.3 From 8063e34bb175e058ea2de0d8fffc03011f68c3ee Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 21 Feb 2008 16:18:33 +0000 Subject: fix mirror handling for openmoko, oplinux and nylon. Closes 3585. * patch from 3585 is now fully applied --- classes/nylon-mirrors.bbclass | 8 ++++---- classes/oplinux-mirrors.bbclass | 16 ++++++++-------- conf/distro/openmoko.conf | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/classes/nylon-mirrors.bbclass b/classes/nylon-mirrors.bbclass index 25a8b87d9b..02fddc01ba 100644 --- a/classes/nylon-mirrors.bbclass +++ b/classes/nylon-mirrors.bbclass @@ -1,6 +1,6 @@ MIRRORS_append () { -ftp://.*/.*/ http://meshcube.org/nylon/stable/sources/ -https?://.*/.*/ http://meshcube.org/nylon/stable/sources/ -ftp://.*/.*/ http://meshcube.org/nylon/unstable/sources/ -https?://.*/.*/ http://meshcube.org/nylon/unstable/sources/ +ftp://.*/.* http://meshcube.org/nylon/stable/sources/ +https?://.*/.* http://meshcube.org/nylon/stable/sources/ +ftp://.*/.* http://meshcube.org/nylon/unstable/sources/ +https?://.*/.* http://meshcube.org/nylon/unstable/sources/ } \ No newline at end of file diff --git a/classes/oplinux-mirrors.bbclass b/classes/oplinux-mirrors.bbclass index c76e822ce3..59c199485c 100644 --- a/classes/oplinux-mirrors.bbclass +++ b/classes/oplinux-mirrors.bbclass @@ -2,13 +2,13 @@ # Released under the MIT license (see packages/COPYING) MIRRORS_append () { -ftp://.*/.*/ http://digital-opsis.com/oplinux/stable/sources/ -https?://.*/.*/ http://digital-opsis.com/oplinux/stable/sources/ -ftp://.*/.*/ http://digital-opsis.com/oplinux/unstable/sources/ -https?://.*/.*/ http://digital-opsis.com/oplinux/unstable/sources/ +ftp://.*/.* http://digital-opsis.com/oplinux/stable/sources/ +https?://.*/.* http://digital-opsis.com/oplinux/stable/sources/ +ftp://.*/.* http://digital-opsis.com/oplinux/unstable/sources/ +https?://.*/.* http://digital-opsis.com/oplinux/unstable/sources/ -ftp://.*/.*/ http://digital-opsis.com/oplinux-uclibc/stable/sources/ -https?://.*/.*/ http://digital-opsis.com/oplinux-uclibc/stable/sources/ -ftp://.*/.*/ http://digital-opsis.com/oplinux-uclibc/unstable/sources/ -https?://.*/.*/ http://digital-opsis.com/oplinux-uclibc/unstable/sources/ +ftp://.*/.* http://digital-opsis.com/oplinux-uclibc/stable/sources/ +https?://.*/.* http://digital-opsis.com/oplinux-uclibc/stable/sources/ +ftp://.*/.* http://digital-opsis.com/oplinux-uclibc/unstable/sources/ +https?://.*/.* http://digital-opsis.com/oplinux-uclibc/unstable/sources/ } diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index f6968cee00..55237c89b8 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -19,7 +19,7 @@ OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:buil CVS_TARBALL_STASH = "http://downloads.openmoko.org/sources/" -PREMIRRORS = "(ftp|https?)$://.*/.*/ http://downloads.openmoko.org/sources/" +PREMIRRORS = "(ftp|https?)$://.*/.* http://downloads.openmoko.org/sources/" FEED_URIS = "\ snapshot-all##http://buildhost.openmoko.org/snapshots/2007.08/ipk/all \ -- cgit v1.2.3 From d5a05e2429751245399bec95f0cf710471100100 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 21 Feb 2008 17:02:20 +0000 Subject: kdepimpi: commit hrw's kdepimpi X11 version. Yet untested. Closes 371. --- packages/kdepimpi/kdepimpi-qte.inc | 163 ++++++++++++++++++++++++ packages/kdepimpi/kdepimpi-x11.inc | 70 ++++++++++ packages/kdepimpi/kdepimpi-x11/.mtn2git_empty | 0 packages/kdepimpi/kdepimpi-x11/kabc.patch | 22 ++++ packages/kdepimpi/kdepimpi-x11/kammu.patch | 16 +++ packages/kdepimpi/kdepimpi-x11/korganizer.patch | 22 ++++ packages/kdepimpi/kdepimpi-x11/libkcal.patch | 13 ++ packages/kdepimpi/kdepimpi-x11/nomail.patch | 16 +++ packages/kdepimpi/kdepimpi-x11_2.2.3.bb | 10 ++ packages/kdepimpi/kdepimpi_2.2.3.bb | 3 + packages/kdepimpi/pwmpi_2.2.3.bb | 3 + 11 files changed, 338 insertions(+) create mode 100644 packages/kdepimpi/kdepimpi-qte.inc create mode 100644 packages/kdepimpi/kdepimpi-x11.inc create mode 100644 packages/kdepimpi/kdepimpi-x11/.mtn2git_empty create mode 100644 packages/kdepimpi/kdepimpi-x11/kabc.patch create mode 100644 packages/kdepimpi/kdepimpi-x11/kammu.patch create mode 100644 packages/kdepimpi/kdepimpi-x11/korganizer.patch create mode 100644 packages/kdepimpi/kdepimpi-x11/libkcal.patch create mode 100644 packages/kdepimpi/kdepimpi-x11/nomail.patch create mode 100644 packages/kdepimpi/kdepimpi-x11_2.2.3.bb create mode 100644 packages/kdepimpi/kdepimpi_2.2.3.bb create mode 100644 packages/kdepimpi/pwmpi_2.2.3.bb diff --git a/packages/kdepimpi/kdepimpi-qte.inc b/packages/kdepimpi/kdepimpi-qte.inc new file mode 100644 index 0000000000..3fa8781658 --- /dev/null +++ b/packages/kdepimpi/kdepimpi-qte.inc @@ -0,0 +1,163 @@ +DESCRIPTION = "KDE-Pim Platform Independent - port of KDE Pim to PDA" +DESCRIPTION_kopi = "Korganizer/PI is a powerful calendar and ToDo Tool" +DESCRIPTION_kopi-applet = "KDE Pim/PI applet" +DESCRIPTION_kapi = "KAddressbook/PI is a port of KDE addressbook" +DESCRIPTION_libmicrokdelibs = "KDE Pim/PI library - microkde" +DESCRIPTION_libmicrokcal = "KDE Pim/PI library - microkcal" +DESCRIPTION_libmicrokabc = "KDE Pim/PI library - microkabc" +DESCRIPTION_libmicrokammu = "KDE Pim/PI fork of libGammu" +DESCRIPTION_kammu = "KDE Pim/PI fork of gammu" + +SECTION = "opie/pim" +PRIORITY = "optional" +LICENSE = "GPL" +HOMEPAGE = "ht