[oe-commits] org.oe.dev merge of '3b3bdcaa9ad2328f02f412cfd58e88c216486d47'
koen commit
oe at amethyst.openembedded.net
Thu Mar 20 12:38:06 UTC 2008
merge of '3b3bdcaa9ad2328f02f412cfd58e88c216486d47'
and '808c0f3bcbe784d70daee61bfb6f464d0072147f'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: c367b4afb7041135ba22ea1db88b5860dc7d243f
ViewMTN: http://monotone.openembedded.org/revision/info/c367b4afb7041135ba22ea1db88b5860dc7d243f
Files:
1
packages/vte/vte_0.16.13.bb
conf/distro/angstrom-2008.1.conf
conf/distro/include/angstrom-2008-preferred-versions.inc
packages/gstreamer/gstreamer/po-makefile-fix.patch
classes/autotools.bbclass
classes/native.bbclass
classes/package.bbclass
conf/distro/include/sane-srcrevs.inc
packages/gstreamer/gstreamer_0.10.17.bb
Diffs:
#
# mt diff -r3b3bdcaa9ad2328f02f412cfd58e88c216486d47 -rc367b4afb7041135ba22ea1db88b5860dc7d243f
#
#
#
# add_file "packages/vte/vte_0.16.13.bb"
# content [07c7810a2019c094f4d7e6dd69d8b110eb03d1a1]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [5c5fce6eea9295023e972ef3168ecfe9d891845c]
# to [00d7a502fb3a2a220a9e65b25b8acb2fbf3fe05d]
#
# patch "conf/distro/include/angstrom-2008-preferred-versions.inc"
# from [41b541c02998505d16e4a6b698b0aa8ac26b1819]
# to [a93dbc58945bc2a58e31dc23c8a49662edf1ff28]
#
============================================================
--- packages/vte/vte_0.16.13.bb 07c7810a2019c094f4d7e6dd69d8b110eb03d1a1
+++ packages/vte/vte_0.16.13.bb 07c7810a2019c094f4d7e6dd69d8b110eb03d1a1
@@ -0,0 +1 @@
+require vte.inc
============================================================
--- conf/distro/angstrom-2008.1.conf 5c5fce6eea9295023e972ef3168ecfe9d891845c
+++ conf/distro/angstrom-2008.1.conf 00d7a502fb3a2a220a9e65b25b8acb2fbf3fe05d
@@ -81,7 +81,6 @@ PREFERRED_VERSION_glib-2.0
#Prefer a newer GTK+ and friends
PREFERRED_VERSION_gtk+ ?= "2.12.3"
PREFERRED_VERSION_glib-2.0 ?= "2.14.4"
-PREFERRED_VERSION_pango ?= "1.18.1"
PREFERRED_PROVIDER_avahi = "avahi"
============================================================
--- conf/distro/include/angstrom-2008-preferred-versions.inc 41b541c02998505d16e4a6b698b0aa8ac26b1819
+++ conf/distro/include/angstrom-2008-preferred-versions.inc a93dbc58945bc2a58e31dc23c8a49662edf1ff28
@@ -5,4 +5,3 @@ PREFERRED_VERSION_udev = "118"
PREFERRED_VERSION_libtool = "1.5.10"
PREFERRED_VERSION_pulseaudio = "0.9.9"
PREFERRED_VERSION_udev = "118"
-PREFERRED_VERSION_vte = "0.16.10"
#
# mt diff -r808c0f3bcbe784d70daee61bfb6f464d0072147f -rc367b4afb7041135ba22ea1db88b5860dc7d243f
#
#
#
# add_file "packages/gstreamer/gstreamer/po-makefile-fix.patch"
# content [f1f912aed675c4ee4a95afc10ddc87ed6ee8ef9d]
#
# patch "classes/autotools.bbclass"
# from [d5a547cefa5e9958965f5dda7aac45f65e89d575]
# to [a03edf4667fb88b98d0f6ea62adcf75168d43bea]
#
# patch "classes/native.bbclass"
# from [ff9a8ed86294577afe2ec629e61b3d86ca2eec27]
# to [49b3ea484f76f2d16525a51fd376aab503da1e3b]
#
# patch "classes/package.bbclass"
# from [e1d1b0d0d549915c2162821bd76d7e95f0baea5d]
# to [906d70a366b88e9727bc076e7246c6de0874bc0f]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [64e775c7452446ab8fb516b74096c5aad891a927]
# to [55633da67c926669fe7beb444ae99d39d9af5462]
#
# patch "packages/gstreamer/gstreamer_0.10.17.bb"
# from [5ed31adc22e5c777ea6a206f57d4e85992cd22b8]
# to [ec06bc77d66c0e2f9c6286fa2dafe211dfacb017]
#
============================================================
--- packages/gstreamer/gstreamer/po-makefile-fix.patch f1f912aed675c4ee4a95afc10ddc87ed6ee8ef9d
+++ packages/gstreamer/gstreamer/po-makefile-fix.patch f1f912aed675c4ee4a95afc10ddc87ed6ee8ef9d
@@ -0,0 +1,13 @@
+Index: gstreamer-0.10.17/po/Makefile.in.in
+===================================================================
+--- gstreamer-0.10.17.orig/po/Makefile.in.in 2008-01-25 23:21:31.000000000 +0800
++++ gstreamer-0.10.17/po/Makefile.in.in 2008-03-20 19:10:54.000000000 +0800
+@@ -30,7 +30,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
++mkinstalldirs = $(MKINSTALLDIRS)
+
+ GMSGFMT = @GMSGFMT@
+ MSGFMT = @MSGFMT@
============================================================
--- classes/autotools.bbclass d5a547cefa5e9958965f5dda7aac45f65e89d575
+++ classes/autotools.bbclass a03edf4667fb88b98d0f6ea62adcf75168d43bea
@@ -165,6 +165,17 @@ autotools_stage_includes() {
fi
}
+autotools_stage_dir() {
+ from="$1"
+ to="$2"
+ # This will remove empty directories so we can ignore them
+ rmdir "$from" 2> /dev/null || true
+ if [ -d "$from" ]; then
+ mkdir -p "$to"
+ cp -fpPR -t "$to" "$from"/*
+ fi
+}
+
autotools_stage_all() {
if [ "${INHIBIT_AUTO_STAGE}" = "1" ]
then
@@ -173,9 +184,13 @@ autotools_stage_all() {
rm -rf ${STAGE_TEMP}
mkdir -p ${STAGE_TEMP}
oe_runmake DESTDIR="${STAGE_TEMP}" install
- if [ -d ${STAGE_TEMP}/${includedir} ]; then
- mkdir -p ${STAGING_INCDIR}
- cp -fpPR -t ${STAGING_INCDIR} ${STAGE_TEMP}/${includedir}/*
+ autotools_stage_dir ${STAGE_TEMP}/${includedir} ${STAGING_INCDIR}
+ if [ "${BUILD_SYS}" = "${HOST_SYS}" ]; then
+ autotools_stage_dir ${STAGE_TEMP}/${bindir} ${STAGING_DIR_HOST}${layout_bindir}
+ autotools_stage_dir ${STAGE_TEMP}/${sbindir} ${STAGING_DIR_HOST}${layout_sbindir}
+ autotools_stage_dir ${STAGE_TEMP}/${base_bindir} ${STAGING_DIR_HOST}${layout_base_bindir}
+ autotools_stage_dir ${STAGE_TEMP}/${base_sbindir} ${STAGING_DIR_HOST}${layout_base_sbindir}
+ autotools_stage_dir ${STAGE_TEMP}/${libexecdir} ${STAGING_DIR_HOST}${layout_libexecdir}
fi
if [ -d ${STAGE_TEMP}/${libdir} ]
then
@@ -200,41 +215,9 @@ autotools_stage_all() {
cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
fi
fi
-
- #This will remove an empty directory so we can ignore it
- rmdir ${STAGE_TEMP}/${datadir} || true
- if [ -d ${STAGE_TEMP}/${datadir} ]; then
- install -d ${STAGING_DATADIR}/
- cp -fpPR ${STAGE_TEMP}/${datadir}/* ${STAGING_DATADIR}/
- fi
-
- if [ "${AUTOTOOLS_NATIVE_STAGE_BINARIES}" = "1" ] ; then
- #This will remove an empty directory so we can ignore it
- rmdir ${STAGE_TEMP}/${bindir} || true
- if [ -d ${STAGE_TEMP}/${bindir} ]; then
- mkdir -p ${STAGING_DIR_HOST}${layout_bindir}
- cp -fpPR -t ${STAGING_DIR_HOST}/${layout_bindir} ${STAGE_TEMP}/${bindir}/*
- fi
- #This will remove an empty directory so we can ignore it
- rmdir ${STAGE_TEMP}/${sbindir} || true
- if [ -d ${STAGE_TEMP}/${sbindir} ]; then
- mkdir -p ${STAGING_DIR_HOST}${layout_sbindir}
- cp -fpPR -t ${STAGING_DIR_HOST}/${layout_sbindir} ${STAGE_TEMP}/${sbindir}/*
- fi
- #This will remove an empty directory so we can ignore it
- rmdir ${STAGE_TEMP}/${base_bindir} || true
- if [ -d ${STAGE_TEMP}/${base_bindir} ]; then
- mkdir -p ${STAGING_DIR_HOST}${layout_base_bindir}
- cp -fpPR -t ${STAGING_DIR_HOST}/${layout_base_bindir} ${STAGE_TEMP}/${base_bindir}/*
- fi
- #This will remove an empty directory so we can ignore it
- rmdir ${STAGE_TEMP}/${base_sbindir} || true
- if [ -d ${STAGE_TEMP}/${base_sbindir} ]; then
- mkdir -p ${STAGING_DIR_HOST}${layout_base_sbindir}
- cp -fpPR -t ${STAGING_DIR_HOST}/${layout_nase_sbindir} ${STAGE_TEMP}/${base_sbindir}/*
- fi
-
- fi
+ rm -rf ${STAGE_TEMP}/${mandir} || true
+ rm -rf ${STAGE_TEMP}/${infodir} || true
+ autotools_stage_dir ${STAGE_TEMP}/${datadir} ${STAGING_DATADIR}
rm -rf ${STAGE_TEMP}
}
============================================================
--- classes/native.bbclass ff9a8ed86294577afe2ec629e61b3d86ca2eec27
+++ classes/native.bbclass 49b3ea484f76f2d16525a51fd376aab503da1e3b
@@ -80,7 +80,6 @@ do_stage () {
then
oe_runmake install
else
- export AUTOTOOLS_NATIVE_STAGE_BINARIES="1"
autotools_stage_all
fi
fi
============================================================
--- classes/package.bbclass e1d1b0d0d549915c2162821bd76d7e95f0baea5d
+++ classes/package.bbclass 906d70a366b88e9727bc076e7246c6de0874bc0f
@@ -490,6 +490,8 @@ python emit_pkgdata() {
for pkg in packages.split():
subdata_file = pkgdatadir + "/runtime/%s" % pkg
sf = open(subdata_file, 'w')
+ write_if_exists(sf, pkg, 'PN')
+ write_if_exists(sf, pkg, 'PR')
write_if_exists(sf, pkg, 'DESCRIPTION')
write_if_exists(sf, pkg, 'RDEPENDS')
write_if_exists(sf, pkg, 'RPROVIDES')
@@ -497,7 +499,6 @@ python emit_pkgdata() {
write_if_exists(sf, pkg, 'RSUGGESTS')
write_if_exists(sf, pkg, 'RREPLACES')
write_if_exists(sf, pkg, 'RCONFLICTS')
- write_if_exists(sf, pkg, 'PR')
write_if_exists(sf, pkg, 'PKG')
write_if_exists(sf, pkg, 'ALLOW_EMPTY')
write_if_exists(sf, pkg, 'FILES')
============================================================
--- conf/distro/include/sane-srcrevs.inc 64e775c7452446ab8fb516b74096c5aad891a927
+++ conf/distro/include/sane-srcrevs.inc 55633da67c926669fe7beb444ae99d39d9af5462
@@ -137,9 +137,9 @@ SRCREV_pn-openocd-native ?= "517"
SRCREV_pn-openmoko-worldclock2 ?= "3365"
SRCREV_pn-openocd ?= "517"
SRCREV_pn-openocd-native ?= "517"
-SRCREV_pn-opkg ?= "4210"
-SRCREV_pn-opkg-native ?= "4210"
-SRCREV_pn-opkg-sdk ?= "4209"
+SRCREV_pn-opkg ?= "4235"
+SRCREV_pn-opkg-native ?= "4235"
+SRCREV_pn-opkg-sdk ?= "4235"
SRCREV_pn-oprofileui ?= "160"
SRCREV_pn-psplash ?= "249"
SRCREV_pn-pylgrim ?= "20"
============================================================
--- packages/gstreamer/gstreamer_0.10.17.bb 5ed31adc22e5c777ea6a206f57d4e85992cd22b8
+++ packages/gstreamer/gstreamer_0.10.17.bb ec06bc77d66c0e2f9c6286fa2dafe211dfacb017
@@ -1,3 +1,6 @@ require gstreamer.inc
require gstreamer.inc
+PR = "r1"
+
+SRC_URI += "file://po-makefile-fix.patch;patch=1"
+
-PR = "r0"
More information about the Openembedded-commits
mailing list