[oe-commits] org.oe.dev merge of '84ca9f2e827e4279aedbe892643f7a992b5c68c0'
pfalcon commit
openembedded-commits at lists.openembedded.org
Tue Sep 4 16:45:25 UTC 2007
merge of '84ca9f2e827e4279aedbe892643f7a992b5c68c0'
and 'a0ad096ef87c2c04fc6f10e82e1a8f91d80c5354'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 56e32dc4491f0aca00c832760000405dff9bc562
ViewMTN: http://monotone.openembedded.org/revision.psp?id=56e32dc4491f0aca00c832760000405dff9bc562
Files:
1
packages/angstrom/angstrom-feed-configs.bb
packages/angstrom/angstrom-version.bb
packages/ffmpeg/ffmpeg_svn.bb
packages/libowl/libowl_svn.bb
packages/libxosd/libxosd_svn.bb
packages/matchbox-keyboard/matchbox-keyboard_svn.bb
packages/matchbox-panel/matchbox-panel_svn.bb
packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb
packages/matchbox2/matchbox-desktop-2_svn.bb
packages/matchbox2/matchbox-panel-2_svn.bb
packages/sphyrna/sphyrna_svn.bb
packages/tinymail/libtinymail_svn.bb
packages/xoo/xoo_svn.bb
conf/distro/include/angstrom.inc
packages/qte/qte-mt-static_2.3.10.bb
Diffs:
#
# mt diff -r84ca9f2e827e4279aedbe892643f7a992b5c68c0 -r56e32dc4491f0aca00c832760000405dff9bc562
#
#
#
# patch "packages/angstrom/angstrom-feed-configs.bb"
# from [0ea9d88230134ade107de738ba3400d561a97222]
# to [e16e9d7e55e13796f4551ba6ba67f36046f98ca0]
#
# patch "packages/angstrom/angstrom-version.bb"
# from [56972530bb9af1a67e7b2fbf8e654891f1e8bf45]
# to [ff131aaba95a9bcd3a37ebca6e4718b621306acf]
#
# patch "packages/ffmpeg/ffmpeg_svn.bb"
# from [3b45e6e26bc71117b35e2213f1dc4abfe0a41900]
# to [bbec70f8e24f42a23765cb68308fc94056887e01]
#
# patch "packages/libowl/libowl_svn.bb"
# from [3130df44fd115dea07f7f96a3b64bc622176da7f]
# to [d5d85a76511d0833f4f28984af1609606a459337]
#
# patch "packages/libxosd/libxosd_svn.bb"
# from [efced9d9b09324606848358429b95165f7e5ec2b]
# to [c7e197aa90f23d522606881d062f643bf7f125ca]
#
# patch "packages/matchbox-keyboard/matchbox-keyboard_svn.bb"
# from [1840f096896c1cc727f7f005b5a115385f0ca269]
# to [074e92b268ce0255545b589da69bd19c618430c4]
#
# patch "packages/matchbox-panel/matchbox-panel_svn.bb"
# from [8a407b1214e44ac6794d5e4190d7238e9c7d2e0c]
# to [4310cb0512a73eae27c817f8a459c80edf572127]
#
# patch "packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb"
# from [52fb3dd027f65d3b4622d23994762afcd09eac92]
# to [6e4739d51639a740ce630e208af17fd52bae8f52]
#
# patch "packages/matchbox2/matchbox-desktop-2_svn.bb"
# from [b085a6edcdf7979b66e72de13cb170951fe95823]
# to [525c7a7c1325bba05f2be22dd2c277ea43fd58a3]
#
# patch "packages/matchbox2/matchbox-panel-2_svn.bb"
# from [f48c21f7a7a584341bb86d796bb80db3245c52ee]
# to [4dee837905f7d6b79470790051914e4edf2d33ad]
#
# patch "packages/sphyrna/sphyrna_svn.bb"
# from [5444a9b2fb67eeeecc67659b5d6198d6db396662]
# to [e0cbc22f9d37eb33ca462828c4747e6df29272b2]
#
# patch "packages/tinymail/libtinymail_svn.bb"
# from [95b1e881ae2bdb772c8dd50b9dbb4b1ed1e07002]
# to [7fd665a806fc4741c74436c9c42b38ef5cc52a08]
#
# patch "packages/xoo/xoo_svn.bb"
# from [6bf0f87d01b48ae41e72e43d16dbeb8fc859454c]
# to [f8b0b32f636f02a8b0d654f47abc6342070b8da4]
#
============================================================
--- packages/angstrom/angstrom-feed-configs.bb 0ea9d88230134ade107de738ba3400d561a97222
+++ packages/angstrom/angstrom-feed-configs.bb e16e9d7e55e13796f4551ba6ba67f36046f98ca0
@@ -1,6 +1,6 @@ DESCRIPTION = "Configuration files for o
DESCRIPTION = "Configuration files for online package repositories aka feeds"
-PR = "0"
+PR = "1"
PACKAGE_ARCH = "${MACHINE_ARCH}"
FEED_BASEPATH ?= "unstable/feed/"
@@ -21,3 +21,12 @@ do_install () {
install -m 0644 ${S}/${sysconfdir}/ipkg/* ${D}${sysconfdir}/ipkg/
}
+CONFFILES_${PN} += "${sysconfdir}/ipkg/base-feed.conf \
+ ${sysconfdir}/ipkg/debug-feed.conf \
+ ${sysconfdir}/ipkg/perl-feed.conf \
+ ${sysconfdir}/ipkg/python-feed.conf \
+ ${sysconfdir}/ipkg/gstreamer-feed.conf \
+ ${sysconfdir}/ipkg/${MACHINE_ARCH}-feed.conf \
+ ${sysconfdir}/ipkg/noarch-feed.conf \
+ "
+
============================================================
--- packages/angstrom/angstrom-version.bb 56972530bb9af1a67e7b2fbf8e654891f1e8bf45
+++ packages/angstrom/angstrom-version.bb ff131aaba95a9bcd3a37ebca6e4718b621306acf
@@ -1,9 +1,10 @@ PV = "${DISTRO_VERSION}"
PV = "${DISTRO_VERSION}"
+PR = "r1"
PACKAGES = "${PN}"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-do_compile() {
+do_install() {
mkdir -p ${D}${sysconfdir}
echo "Angstrom ${DISTRO_VERSION}" > ${D}${sysconfdir}/angstrom-version
============================================================
--- packages/ffmpeg/ffmpeg_svn.bb 3b45e6e26bc71117b35e2213f1dc4abfe0a41900
+++ packages/ffmpeg/ffmpeg_svn.bb bbec70f8e24f42a23765cb68308fc94056887e01
@@ -1,9 +1,9 @@ DEPENDS = "libogg zlib libvorbis faac li
DESCRIPTION = "ffmpeg"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "libogg zlib libvorbis faac liba52 lame"
-PV = "0.4.9+svn${SRCDATE}"
+PV = "0.4.9+svnr${SRCREV}"
PR = "r1"
DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/libowl/libowl_svn.bb 3130df44fd115dea07f7f96a3b64bc622176da7f
+++ packages/libowl/libowl_svn.bb d5d85a76511d0833f4f28984af1609606a459337
@@ -12,7 +12,7 @@ PR = "r3"
LICENSE = "LGPL"
SECTION = "libs"
PR = "r3"
-PV = "0.0+svn${SRCDATE}"
+PV = "0.0+svnr${SRCREV}"
DEPENDS = "gtk+ glib-2.0"
PACKAGES = ""
============================================================
--- packages/libxosd/libxosd_svn.bb efced9d9b09324606848358429b95165f7e5ec2b
+++ packages/libxosd/libxosd_svn.bb c7e197aa90f23d522606881d062f643bf7f125ca
@@ -1,8 +1,8 @@ LICENSE = "LGPL"
DESCRIPTION = "A library for displaying a TV-like on-screen display in X."
SECTION = "libs/x11"
DEPENDS = "virtual/libx11 libxext"
LICENSE = "LGPL"
-PV = "2.2.15+svn${SRCDATE}"
+PV = "2.2.15+svnr${SRCREV}"
PR = "r5"
SRC_URI = "svn://libxosd.svn.sourceforge.net/svnroot/libxosd/source;module=current;proto=https \
============================================================
--- packages/matchbox-keyboard/matchbox-keyboard_svn.bb 1840f096896c1cc727f7f005b5a115385f0ca269
+++ packages/matchbox-keyboard/matchbox-keyboard_svn.bb 074e92b268ce0255545b589da69bd19c618430c4
@@ -1,17 +1,17 @@ SECTION = "x11"
DESCRIPTION = "Matchbox virtual keyboard for X11"
LICENSE = "GPL"
DEPENDS = "libfakekey expat libxft"
RCONFLICTS = matchbox-keyboard-inputmethod
RPROVIDES_${PN} = matchbox-keyboard-inputmethod
SECTION = "x11"
-PV = "0.0+svn${SRCDATE}"
+PV = "0.0+svnr${SRCREV}"
PR="r6"
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
file://smallscreen-fontsize.patch;patch=1 \
- file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \
- file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \
- file://4-Add-rendering-debug-logging.patch;patch=1 \
+# file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \
+# file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \
+# file://4-Add-rendering-debug-logging.patch;patch=1 \
file://5-Add-support-for-loading-multiple-independent-layouts.patch;patch=1 \
file://6-Add-layout-switch-key-to-all-layouts.patch;patch=1 \
"
@@ -26,5 +26,5 @@ FILES_${PN} = "${bindir}/* \
FILES_${PN} = "${bindir}/* \
${datadir}/applications \
${datadir}/pixmaps \
- ${datadir}/matchbox-keyboard"
+ ${datadir}/matchbox-keyboard"
============================================================
--- packages/matchbox-panel/matchbox-panel_svn.bb 8a407b1214e44ac6794d5e4190d7238e9c7d2e0c
+++ packages/matchbox-panel/matchbox-panel_svn.bb 4310cb0512a73eae27c817f8a459c80edf572127
@@ -1,5 +1,5 @@ require matchbox-panel.inc
require matchbox-panel.inc
-PV = "0.9.2+svn${SRCDATE}"
+PV = "0.9.2+svnr${SRCREV}"
DEFAULT_PREFERENCE = "-1"
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
============================================================
--- packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb 52fb3dd027f65d3b4622d23994762afcd09eac92
+++ packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb 6e4739d51639a740ce630e208af17fd52bae8f52
@@ -1,9 +1,11 @@ SECTION = "x11/wm"
DESCRIPTION = "Matchbox window manager Sato theme"
LICENSE = "GPL"
DEPENDS = "matchbox-wm"
SECTION = "x11/wm"
-PV = "0.1+svn${SRCDATE}"
+DEFAULT_PREFERENCE = "-1"
+
+PV = "0.1+svnr${SRCREV}"
PR = "r0"
PACKAGE_ARCH = "all"
============================================================
--- packages/matchbox2/matchbox-desktop-2_svn.bb b085a6edcdf7979b66e72de13cb170951fe95823
+++ packages/matchbox2/matchbox-desktop-2_svn.bb 525c7a7c1325bba05f2be22dd2c277ea43fd58a3
@@ -1,9 +1,9 @@ DEPENDS = "gtk+ startup-notification"
DESCRIPTION = "Matchbox Window Manager Desktop"
LICENSE = "GPL"
SECTION = "x11/panels"
DEPENDS = "gtk+ startup-notification"
-PV = "0.1+svn${SRCDATE}"
+PV = "0.1+svnr${SRCREV}"
PR = "r0"
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
============================================================
--- packages/matchbox2/matchbox-panel-2_svn.bb f48c21f7a7a584341bb86d796bb80db3245c52ee
+++ packages/matchbox2/matchbox-panel-2_svn.bb 4dee837905f7d6b79470790051914e4edf2d33ad
@@ -1,8 +1,8 @@ DEPENDS = "gtk+ apmd startup-notificatio
DESCRIPTION = "matchbox-panel-2 is a lightweight dock (system tray) application based on Gtk+"
LICENSE = "GPL"
SECTION = "x11/panels"
DEPENDS = "gtk+ apmd startup-notification"
-PV = "0.1+svn${SRCDATE}"
+PV = "0.1+svnr${SRCREV}"
PR = "r8"
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
============================================================
--- packages/sphyrna/sphyrna_svn.bb 5444a9b2fb67eeeecc67659b5d6198d6db396662
+++ packages/sphyrna/sphyrna_svn.bb e0cbc22f9d37eb33ca462828c4747e6df29272b2
@@ -1,8 +1,8 @@ DEPENDS = "readline"
DESCRIPTION = "Sphyrna - Hammerhead Reverse Engineering"
HOMEPAGE = "http://projects.linuxtogo.org/projects/sphyrna"
LICENSE = "GPLv2"
DEPENDS = "readline"
-PV = "0.0+svn${SRCDATE}"
+PV = "0.0+svnr${SRCREV}"
PR = "r0"
SRC_URI = "svn://projects.linuxtogo.org/svn;module=sphyrna"
============================================================
--- packages/tinymail/libtinymail_svn.bb 95b1e881ae2bdb772c8dd50b9dbb4b1ed1e07002
+++ packages/tinymail/libtinymail_svn.bb 7fd665a806fc4741c74436c9c42b38ef5cc52a08
@@ -1,8 +1,8 @@ DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf
DESCRIPTION = "TinyMail is an attempt to create an E-mail framework for mobile devices"
SECTION = "x11/utils"
LICENSE = "LGPL"
DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf-dbus libgnomeui"
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.0.1+svnr${SRCREV}"
PR = "r3"
DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/xoo/xoo_svn.bb 6bf0f87d01b48ae41e72e43d16dbeb8fc859454c
+++ packages/xoo/xoo_svn.bb f8b0b32f636f02a8b0d654f47abc6342070b8da4
@@ -1,10 +1,10 @@ DEPENDS = "virtual/libx11 libxtst gtk+ l
DESCRIPTION = "Xoo is a GTK2 based graphical wrapper around a windowed X Server. \
It is intended for embedded developers that want to simulate a target device \
(with an accurate display size, working hardware buttons, etc) on a desktop machine."
HOMEPAGE = "http://projects.o-hand.com/xoo"
LICENSE = "GPL"
DEPENDS = "virtual/libx11 libxtst gtk+ libglade"
-PV = "0.7+svn${SRCDATE}"
+PV = "0.7+svnr${SRCREV}"
PR = "r1"
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=Xoo;proto=http \
#
# mt diff -ra0ad096ef87c2c04fc6f10e82e1a8f91d80c5354 -r56e32dc4491f0aca00c832760000405dff9bc562
#
#
#
# patch "conf/distro/include/angstrom.inc"
# from [314e54232030fd4279f9794dc77445d68a4fa3ba]
# to [a2a82e18304dfe7b293702a9f4e750a8b9793d6a]
#
# patch "packages/qte/qte-mt-static_2.3.10.bb"
# from [cba36c3850ac2b08dab6647b33bf4f0538bf1ba5]
# to [0e4fb9a326b0c9f986910827e9c39d1d1cddf0b5]
#
============================================================
--- conf/distro/include/angstrom.inc 314e54232030fd4279f9794dc77445d68a4fa3ba
+++ conf/distro/include/angstrom.inc a2a82e18304dfe7b293702a9f4e750a8b9793d6a
@@ -16,6 +16,11 @@ ANGSTROM_URI ?= "http://www.angstrom-dis
#Use this variable in feeds and other parts that need a URI
ANGSTROM_URI ?= "http://www.angstrom-distribution.org"
+#Use this variable to select which recipe you want to use to get feed configs (/etc/ipkg/*, /etc/apt/sources.list)
+# usefull for derivative distros and local testing
+# As this is runtime we can't and won't use virtual/feed-configs
+ANGSTROM_FEED_CONFIGS ?= "angstrom-feed-configs"
+
#Set the default maintainer to angstrom-dev
MAINTAINER = "Angstrom Developers <angstrom-distro-devel at linuxtogo.org>"
============================================================
--- packages/qte/qte-mt-static_2.3.10.bb cba36c3850ac2b08dab6647b33bf4f0538bf1ba5
+++ packages/qte/qte-mt-static_2.3.10.bb 0e4fb9a326b0c9f986910827e9c39d1d1cddf0b5
@@ -1,6 +1,8 @@ PR = "r8"
require qte-common_${PV}.inc
PR = "r8"
+DEFAULT_PREFERENCE = "-1"
+
EXTRA_OECONF += "-static -thread"
do_stage() {
More information about the Openembedded-commits
mailing list