[oe-commits] org.oe.dev merge of '4e3569a19b8a6f85c3878f45db976a5ef67711f2'
oe commit
oe at amethyst.openembedded.net
Wed Jun 18 15:45:14 UTC 2008
merge of '4e3569a19b8a6f85c3878f45db976a5ef67711f2'
and 'b6c9567e6cd15dcc0358bab7cdc8c5d45cc4d0c4'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 2915cdb478cf4568765ca16eeffd71f2f83e6c7b
ViewMTN: http://monotone.openembedded.org/revision/info/2915cdb478cf4568765ca16eeffd71f2f83e6c7b
Files:
1
packages/linux/linux-omap2_git.bb
packages/glib-2.0/glib-2.0-native_2.16.1.bb
conf/distro/include/preferred-om-2008-versions.inc
packages/glib-2.0/glib-2.0_2.16.1.bb
Diffs:
#
# mt diff -r4e3569a19b8a6f85c3878f45db976a5ef67711f2 -r2915cdb478cf4568765ca16eeffd71f2f83e6c7b
#
#
#
# patch "packages/linux/linux-omap2_git.bb"
# from [947402088688f4d67b5eedf1d81246f553d9bd61]
# to [580fe4f093ea9bc87f450c35559f0a65c9097477]
#
============================================================
--- packages/linux/linux-omap2_git.bb 947402088688f4d67b5eedf1d81246f553d9bd61
+++ packages/linux/linux-omap2_git.bb 580fe4f093ea9bc87f450c35559f0a65c9097477
@@ -2,9 +2,9 @@ FILESDIR = "${@os.path.dirname(bb.data.g
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}"
-SRCREV = "74412cbb62b3b4af3f7a1dd9133f19950cd94b2e"
+SRCREV = "5b97d3ec6732c87741b2fc04f2956f097a458818"
-PV = "2.6.25+2.6.26-rc5+${PR}+git${SRCREV}"
+PV = "2.6.25+2.6.26-rc6+${PR}+git${SRCREV}"
PR = "r23"
@@ -13,9 +13,9 @@ SRC_URI_append_beagleboard = " file://no
SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch;patch=1 \
- file://0001-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
- file://0002-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
- file://0003-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
+# file://0001-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
+# file://0002-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
+# file://0003-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
file://0001-omap3-cpuidle.patch;patch=1 \
file://0002-omap3-cpuidle.patch;patch=1 \
"
@@ -23,9 +23,9 @@ SRC_URI_append_omap3evm = " file://no-ha
SRC_URI_append_omap3evm = " file://no-harry-potter.diff;patch=1 \
file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch;patch=1 \
file://flash.patch;patch=1 \
- file://0001-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
- file://0002-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
- file://0003-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
+# file://0001-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
+# file://0002-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
+# file://0003-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
file://0001-omap3-cpuidle.patch;patch=1 \
file://0002-omap3-cpuidle.patch;patch=1 \
"
#
# mt diff -rb6c9567e6cd15dcc0358bab7cdc8c5d45cc4d0c4 -r2915cdb478cf4568765ca16eeffd71f2f83e6c7b
#
#
#
# add_file "packages/glib-2.0/glib-2.0-native_2.16.1.bb"
# content [f19fefa48d990052ffbf58da0fc87cfb88adac17]
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [31082540c36a559d8a98fd280d83efab99ea9661]
# to [dd76fae2197a9207fa2eb5ccd100a425b415f4b4]
#
# patch "packages/glib-2.0/glib-2.0_2.16.1.bb"
# from [5be635a5d5196c526c7181cff6b36dcd3a3767f0]
# to [572e57e8dedd34b4305aba64c763aa3cfd87fd5a]
#
============================================================
--- packages/glib-2.0/glib-2.0-native_2.16.1.bb f19fefa48d990052ffbf58da0fc87cfb88adac17
+++ packages/glib-2.0/glib-2.0-native_2.16.1.bb f19fefa48d990052ffbf58da0fc87cfb88adac17
@@ -0,0 +1,30 @@
+require glib-2.0_${PV}.bb
+
+FILESPATH = "${FILE_DIRNAME}/glib-2.0-${PV}:${FILE_DIRNAME}/files"
+DEPENDS = "gtk-doc-native"
+PR = "r0"
+
+inherit native
+
+do_stage () {
+ install -m 0755 gobject/glib-mkenums ${STAGING_BINDIR}/
+ install -m 0755 gobject/.libs/glib-genmarshal ${STAGING_BINDIR}/
+ install -m 0755 glib-gettextize ${STAGING_BINDIR}/
+ oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
+ autotools_stage_includes
+ install -d ${STAGING_INCDIR}/glib-2.0/glib
+ install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
+ install -d ${STAGING_DATADIR}/aclocal
+ install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
+ install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
+ install -d ${STAGING_DATADIR}/glib-2.0/gettext/po
+ install -m 0755 mkinstalldirs ${STAGING_DATADIR}/glib-2.0/gettext/
+ install -m 0644 po/Makefile.in.in ${STAGING_DATADIR}/glib-2.0/gettext/po/
+}
+
+do_install () {
+ :
+}
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc 31082540c36a559d8a98fd280d83efab99ea9661
+++ conf/distro/include/preferred-om-2008-versions.inc dd76fae2197a9207fa2eb5ccd100a425b415f4b4
@@ -273,7 +273,7 @@ PREFERRED_VERSION_driftnet-nogui ?= "0.1
PREFERRED_VERSION_dpkg-native ?= "1.13.25"
PREFERRED_VERSION_driftnet ?= "0.1.6"
PREFERRED_VERSION_driftnet-nogui ?= "0.1.6"
-PREFERRED_VERSION_dropbear ?= "0.49"
+PREFERRED_VERSION_dropbear ?= "0.51"
PREFERRED_VERSION_dsniff ?= "2.3"
PREFERRED_VERSION_duma ?= "2.5.7"
PREFERRED_VERSION_dvb-image ?= "1.0"
@@ -466,7 +466,7 @@ PREFERRED_VERSION_glib-2.0 ?= "2.16.1"
PREFERRED_VERSION_glib-1.2 ?= "1.2.10"
PREFERRED_VERSION_glib-1.2-native ?= "1.2.10"
PREFERRED_VERSION_glib-2.0 ?= "2.16.1"
-PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
+PREFERRED_VERSION_glib-2.0-native ?= "2.16.1"
PREFERRED_VERSION_glibc ?= "2.6.1"
PREFERRED_VERSION_glibc-initial ?= "2.6.1"
PREFERRED_VERSION_glibmm ?= "2.12.10"
@@ -477,9 +477,9 @@ PREFERRED_VERSION_gmailfs ?= "0.7.3"
PREFERRED_VERSION_glrr-widgets ?= "20050529"
PREFERRED_VERSION_glurp ?= "0.11.3"
PREFERRED_VERSION_gmailfs ?= "0.7.3"
-PREFERRED_VERSION_gmp ?= "4.2.1"
+PREFERRED_VERSION_gmp ?= "4.2.2"
PREFERRED_VERSION_gmpc ?= "0.13.0"
-PREFERRED_VERSION_gmp-native ?= "4.2.1"
+PREFERRED_VERSION_gmp-native ?= "4.2.2"
PREFERRED_VERSION_gnash ?= "0.8.2"
PREFERRED_VERSION_gnocky ?= "0.0.3"
PREFERRED_VERSION_gnokii ?= "0.6.14"
@@ -1369,6 +1369,8 @@ PREFERRED_VERSION_openvpn ?= "2.0.9"
PREFERRED_VERSION_openswan ?= "2.4.7"
PREFERRED_VERSION_openttd ?= "0.4.0.1"
PREFERRED_VERSION_openvpn ?= "2.0.9"
+PREFERRED_VERSION_opkg-native ?= "4488"
+PREFERRED_VERSION_opkg ?= "4488"
PREFERRED_VERSION_oplinux-packages ?= "1.0"
PREFERRED_VERSION_oprofile ?= "0.9.3"
PREFERRED_VERSION_orage ?= "4.4.1"
@@ -1880,7 +1882,7 @@ PREFERRED_VERSION_u-boot-utils ?= "1.2.0
PREFERRED_VERSION_u-boot ?= "1.2.0"
PREFERRED_VERSION_u-boot-omap2430sdp ?= "1.1.4"
PREFERRED_VERSION_u-boot-utils ?= "1.2.0"
-PREFERRED_VERSION_udev ?= "118"
+PREFERRED_VERSION_udev ?= "115"
PREFERRED_VERSION_udev-hostap-cs-vcc-workaround ?= "1.0"
PREFERRED_VERSION_udhcp ?= "0.9.8"
PREFERRED_VERSION_ufraw ?= "0.12"
============================================================
--- packages/glib-2.0/glib-2.0_2.16.1.bb 5be635a5d5196c526c7181cff6b36dcd3a3767f0
+++ packages/glib-2.0/glib-2.0_2.16.1.bb 572e57e8dedd34b4305aba64c763aa3cfd87fd5a
@@ -7,4 +7,6 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOM
file://configure-libtool.patch;patch=1 \
file://gcc-4.2-inline-fix.patch;patch=1 \
file://hurd-arg-max.patch;patch=1 \
+"
+S = "${WORKDIR}/glib-${PV}"
+
- "
More information about the Openembedded-commits
mailing list