[oe-commits] org.oe.dev merge of '4d9368570e94fc8bc65712d1c95027d8a436eee1'

[oe commit]

merge of '4d9368570e94fc8bc65712d1c95027d8a436eee1'
     and '6f9a15eb9033fcc77c3985059f624c5623c9c90b'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 197136c51736dc6cc4c73dc4020f9e3380d2cd3f
ViewMTN: http://monotone.openembedded.org/revision/info/197136c51736dc6cc4c73dc4020f9e3380d2cd3f
Files:
1
packages/python/python-pygobject-native_2.12.3.bb
packages/python/python-pygobject_2.12.3.bb
packages/python/python-pygtk_2.10.4.bb
packages/python/python-pygtk_2.6.3.bb
packages/python/python-pygtk_2.8.6.bb
packages/images/sdr-image.bb
Diffs:

#
# mt diff -r4d9368570e94fc8bc65712d1c95027d8a436eee1 -r197136c51736dc6cc4c73dc4020f9e3380d2cd3f
#
#
#
# patch "packages/python/python-pygobject-native_2.12.3.bb"
#  from [e881bce25bd043f3122882e8e1b3b0605b632c1c]
#    to [a71881af165074dfb63c5cc7e67732e824b04644]
# 
# patch "packages/python/python-pygobject_2.12.3.bb"
#  from [5c93a9f46668bceb4224865a79c52f44de81b1cd]
#    to [e837d955710df4cd8216f94c3eedfba7d8a1a0c5]
# 
# patch "packages/python/python-pygtk_2.10.4.bb"
#  from [7480a2de0d1f999ba0bfe0eafcf5aa21770f1592]
#    to [03f8943de4ec6296829f775f21037f2254e53cc3]
# 
# patch "packages/python/python-pygtk_2.6.3.bb"
#  from [8186a5065f2832dc797285fd18bedb7a93aa8ec8]
#    to [ab6630aaee119de6f3ec2a7f89cb9c143af0a3df]
# 
# patch "packages/python/python-pygtk_2.8.6.bb"
#  from [5af0be1415f9a626a645616713e97c2093b3c140]
#    to [a61490d10c7aded74e89fe928c8a58a987287914]
#
============================================================
--- packages/python/python-pygobject-native_2.12.3.bb	e881bce25bd043f3122882e8e1b3b0605b632c1c
+++ packages/python/python-pygobject-native_2.12.3.bb	a71881af165074dfb63c5cc7e67732e824b04644
@@ -2,6 +2,7 @@ DEPENDS = "python-native glib-2.0-native
 
 DEPENDS = "python-native glib-2.0-native"
 
-SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-${PV}.tar.bz2 "
+MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 "
 
 inherit native
============================================================
--- packages/python/python-pygobject_2.12.3.bb	5c93a9f46668bceb4224865a79c52f44de81b1cd
+++ packages/python/python-pygobject_2.12.3.bb	e837d955710df4cd8216f94c3eedfba7d8a1a0c5
@@ -4,7 +4,8 @@ PR = "r3"
 DEPENDS = "python-pygobject-native"
 PR = "r3"
 
-SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-${PV}.tar.bz2 \
+MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \
            file://python-path.patch;patch=1"
 S = "${WORKDIR}/pygobject-${PV}"
 
============================================================
--- packages/python/python-pygtk_2.10.4.bb	7480a2de0d1f999ba0bfe0eafcf5aa21770f1592
+++ packages/python/python-pygtk_2.10.4.bb	03f8943de4ec6296829f775f21037f2254e53cc3
@@ -8,7 +8,8 @@ PR = "ml8"
 LICENSE = "LGPL"
 PR = "ml8"
 
-SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \
+MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/${MAJ_VER}/${SRCNAME}-${PV}.tar.bz2 \
            file://fix-gtkunixprint.patch;patch=1 \
            file://prevent_to_get_display_during_import.patch;patch=1 \
            file://nodocs.patch;patch=1 \
============================================================
--- packages/python/python-pygtk_2.6.3.bb	8186a5065f2832dc797285fd18bedb7a93aa8ec8
+++ packages/python/python-pygtk_2.6.3.bb	ab6630aaee119de6f3ec2a7f89cb9c143af0a3df
@@ -6,7 +6,8 @@ PR = "ml0"
 LICENSE = "LGPL"
 PR = "ml0"
 
-SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.6/${SRCNAME}-${PV}.tar.bz2 \
+MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/${MAJ_VER}/${SRCNAME}-${PV}.tar.bz2 \
            file://acinclude.m4"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
============================================================
--- packages/python/python-pygtk_2.8.6.bb	5af0be1415f9a626a645616713e97c2093b3c140
+++ packages/python/python-pygtk_2.8.6.bb	a61490d10c7aded74e89fe928c8a58a987287914
@@ -8,7 +8,8 @@ PR = "r1"
 LICENSE = "LGPL"
 PR = "r1"
 
-SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.8/${SRCNAME}-${PV}.tar.bz2 \
+MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/${MAJ_VER}/${SRCNAME}-${PV}.tar.bz2 \
            file://acinclude.m4"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 


#
# mt diff -r6f9a15eb9033fcc77c3985059f624c5623c9c90b -r197136c51736dc6cc4c73dc4020f9e3380d2cd3f
#
#
#
# patch "packages/images/sdr-image.bb"
#  from [b98be7ed4825c6edd9d9db45907e271785280358]
#    to [06181e026ef41c34af7a7919a014709c6ded3895]
#
============================================================
--- packages/images/sdr-image.bb	b98be7ed4825c6edd9d9db45907e271785280358
+++ packages/images/sdr-image.bb	06181e026ef41c34af7a7919a014709c6ded3895
@@ -42,6 +42,7 @@ IMAGE_INSTALL = " task-base-extended \
 	python-core perl \
 	uucp picocom \
 	angstrom-zeroconf-audio avahi-utils \
+	${ANGSTROM_EXTRA_INSTALL} \
 "
 
 inherit image