diff options
15 files changed, 16 insertions, 16 deletions
diff --git a/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb b/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb index ec17c75e37..07b4831cee 100644 --- a/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb +++ b/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb | |||
@@ -22,7 +22,7 @@ SRC_URI[md5sum] = "f3f8052e7b4979a43b75775a381e6cb8" | |||
22 | SRC_URI[sha256sum] = "e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6" | 22 | SRC_URI[sha256sum] = "e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6" |
23 | 23 | ||
24 | #want 3.x from 3.x.y for the installation directory | 24 | #want 3.x from 3.x.y for the installation directory |
25 | SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" | 25 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |
26 | 26 | ||
27 | inherit autotools-brokensep pkgconfig | 27 | inherit autotools-brokensep pkgconfig |
28 | 28 | ||
diff --git a/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb b/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb index d391bba134..7e684c8407 100644 --- a/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb +++ b/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb | |||
@@ -5,7 +5,7 @@ DEPENDS = "gtk+ gnome-doc-utils" | |||
5 | LICENSE = "GPL-2.0" | 5 | LICENSE = "GPL-2.0" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
7 | 7 | ||
8 | SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" | 8 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |
9 | SRC_URI = "http://download.gnome.org/sources/${BPN}/${SHRT_VER}/${BP}.tar.gz" | 9 | SRC_URI = "http://download.gnome.org/sources/${BPN}/${SHRT_VER}/${BP}.tar.gz" |
10 | 10 | ||
11 | SRC_URI[md5sum] = "48db927c6e7ee1d5395f953a8c184c98" | 11 | SRC_URI[md5sum] = "48db927c6e7ee1d5395f953a8c184c98" |
diff --git a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb index dfc1775a30..01da347bde 100644 --- a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb +++ b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb | |||
@@ -10,7 +10,7 @@ inherit gnomebase pkgconfig python-dir pythonnative gobject-introspection | |||
10 | 10 | ||
11 | BPN = "gnome-menus" | 11 | BPN = "gnome-menus" |
12 | 12 | ||
13 | SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" | 13 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |
14 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BPN}-${PV}.tar.xz" | 14 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BPN}-${PV}.tar.xz" |
15 | 15 | ||
16 | SRC_URI[md5sum] = "6db025e79e2b69f39fc7aa0753f43081" | 16 | SRC_URI[md5sum] = "6db025e79e2b69f39fc7aa0753f43081" |
diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb index 1afcd49158..f9af2ee644 100644 --- a/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb +++ b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb | |||
@@ -3,7 +3,7 @@ SECTION = "x11/gnome/libs" | |||
3 | LICENSE = "GPL-2.0" | 3 | LICENSE = "GPL-2.0" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" |
5 | SRC_NAME = "ORBit2" | 5 | SRC_NAME = "ORBit2" |
6 | SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" | 6 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |
7 | SRC_URI = " \ | 7 | SRC_URI = " \ |
8 | ${GNOME_MIRROR}/${SRC_NAME}/${SHRT_VER}/${SRC_NAME}-${PV}.tar.bz2 \ | 8 | ${GNOME_MIRROR}/${SRC_NAME}/${SHRT_VER}/${SRC_NAME}-${PV}.tar.bz2 \ |
9 | file://configure-lossage.patch \ | 9 | file://configure-lossage.patch \ |
diff --git a/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb b/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb index f6aaee0eb6..622db5f7de 100644 --- a/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb +++ b/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb | |||
@@ -15,7 +15,7 @@ inherit autotools systemd | |||
15 | # return something like '1.2.3' or '1.2.3/rc1' | 15 | # return something like '1.2.3' or '1.2.3/rc1' |
16 | # | 16 | # |
17 | def get_sub(d): | 17 | def get_sub(d): |
18 | parts = d.getVar('PV',True).split('-') | 18 | parts = d.getVar('PV').split('-') |
19 | try: | 19 | try: |
20 | return parts[0] + '/' + parts[1] | 20 | return parts[0] + '/' + parts[1] |
21 | except: | 21 | except: |
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc index 9ef54fe17c..424a06b325 100644 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ | |||
7 | file://COPYING-v3;md5=d32239bcb673463ab874e80d47fae504" | 7 | file://COPYING-v3;md5=d32239bcb673463ab874e80d47fae504" |
8 | 8 | ||
9 | #at least versions 2.15 and prior are moved to the archive folder on the server | 9 | #at least versions 2.15 and prior are moved to the archive folder on the server |
10 | SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getVar('PV',1).split('.')[1]) > 15]}dnsmasq-${PV}.tar.gz;name=dnsmasq-${PV} \ | 10 | SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getVar('PV').split('.')[1]) > 15]}dnsmasq-${PV}.tar.gz;name=dnsmasq-${PV} \ |
11 | file://init \ | 11 | file://init \ |
12 | file://dnsmasq.conf \ | 12 | file://dnsmasq.conf \ |
13 | file://dnsmasq-resolvconf.service \ | 13 | file://dnsmasq-resolvconf.service \ |
diff --git a/meta-oe/recipes-core/glib-2.0/glibmm_2.50.0.bb b/meta-oe/recipes-core/glib-2.0/glibmm_2.50.0.bb index ebe7747aec..9479de9809 100644 --- a/meta-oe/recipes-core/glib-2.0/glibmm_2.50.0.bb +++ b/meta-oe/recipes-core/glib-2.0/glibmm_2.50.0.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ | |||
8 | DEPENDS = "mm-common glib-2.0 libsigc++-2.0" | 8 | DEPENDS = "mm-common glib-2.0 libsigc++-2.0" |
9 | inherit autotools pkgconfig | 9 | inherit autotools pkgconfig |
10 | 10 | ||
11 | SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" | 11 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |
12 | 12 | ||
13 | SRC_URI = " \ | 13 | SRC_URI = " \ |
14 | ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.xz \ | 14 | ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.xz \ |
diff --git a/meta-oe/recipes-core/libxml/libxml++_2.38.1.bb b/meta-oe/recipes-core/libxml/libxml++_2.38.1.bb index 70965f313e..2cb9548351 100644 --- a/meta-oe/recipes-core/libxml/libxml++_2.38.1.bb +++ b/meta-oe/recipes-core/libxml/libxml++_2.38.1.bb | |||
@@ -6,7 +6,7 @@ SECTION = "libs" | |||
6 | LICENSE = "LGPL-2.1+" | 6 | LICENSE = "LGPL-2.1+" |
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 " | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 " |
8 | 8 | ||
9 | SHRT_VER = "${@d.getVar('PV',True).split('.')[0]}.${@d.getVar('PV',True).split('.')[1]}" | 9 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |
10 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BP}.tar.xz \ | 10 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BP}.tar.xz \ |
11 | file://libxml++_ptest.patch \ | 11 | file://libxml++_ptest.patch \ |
12 | file://run-ptest \ | 12 | file://run-ptest \ |
diff --git a/meta-oe/recipes-core/meta/distro-feed-configs.bb b/meta-oe/recipes-core/meta/distro-feed-configs.bb index ea5ca38486..2a8de54d24 100644 --- a/meta-oe/recipes-core/meta/distro-feed-configs.bb +++ b/meta-oe/recipes-core/meta/distro-feed-configs.bb | |||
@@ -22,8 +22,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
22 | 22 | ||
23 | #def distro_feed_configs(d): | 23 | #def distro_feed_configs(d): |
24 | # import bb | 24 | # import bb |
25 | # parchs = d.getVar( "PACKAGE_EXTRA_ARCHS", 1 ).split() | 25 | # parchs = d.getVar("PACKAGE_EXTRA_ARCHS").split() |
26 | # march = d.getVar( "MACHINE_ARCH", 1 ).split() | 26 | # march = d.getVar("MACHINE_ARCH").split() |
27 | # archs = [ "all" ] + parchs + march | 27 | # archs = [ "all" ] + parchs + march |
28 | # confs = [ ( "${sysconfdir}/opkg/%s-feed.conf" % feed ) for feed in archs ] | 28 | # confs = [ ( "${sysconfdir}/opkg/%s-feed.conf" % feed ) for feed in archs ] |
29 | # return " ".join( confs ) | 29 | # return " ".join( confs ) |
diff --git a/meta-oe/recipes-devtools/libgee/libgee_0.18.0.bb b/meta-oe/recipes-devtools/libgee/libgee_0.18.0.bb index 3fa9d9fc28..6386f1ffb7 100644 --- a/meta-oe/recipes-devtools/libgee/libgee_0.18.0.bb +++ b/meta-oe/recipes-devtools/libgee/libgee_0.18.0.bb | |||
@@ -18,7 +18,7 @@ do_configure_prepend() { | |||
18 | done | 18 | done |
19 | } | 19 | } |
20 | 20 | ||
21 | SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" | 21 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |
22 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libgee/${SHRT_VER}/${BP}.tar.xz" | 22 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libgee/${SHRT_VER}/${BP}.tar.xz" |
23 | SRC_URI[md5sum] = "29ea6125e653d7e60b49a9a9544abc96" | 23 | SRC_URI[md5sum] = "29ea6125e653d7e60b49a9a9544abc96" |
24 | SRC_URI[sha256sum] = "4ad99ef937d071b4883c061df40bfe233f7649d50c354cf81235f180b4244399" | 24 | SRC_URI[sha256sum] = "4ad99ef937d071b4883c061df40bfe233f7649d50c354cf81235f180b4244399" |
diff --git a/meta-oe/recipes-graphics/pango/pangomm_2.40.1.bb b/meta-oe/recipes-graphics/pango/pangomm_2.40.1.bb index 7ff7b20c8e..02bb1cc93d 100644 --- a/meta-oe/recipes-graphics/pango/pangomm_2.40.1.bb +++ b/meta-oe/recipes-graphics/pango/pangomm_2.40.1.bb | |||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ | |||
6 | 6 | ||
7 | DEPENDS = "mm-common cairomm glibmm pango" | 7 | DEPENDS = "mm-common cairomm glibmm pango" |
8 | 8 | ||
9 | SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" | 9 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |
10 | 10 | ||
11 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/pangomm/${SHRT_VER}/pangomm-${PV}.tar.xz" | 11 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/pangomm/${SHRT_VER}/pangomm-${PV}.tar.xz" |
12 | SRC_URI[md5sum] = "874eadd9434613dbacf0272c82c3ac23" | 12 | SRC_URI[md5sum] = "874eadd9434613dbacf0272c82c3ac23" |
diff --git a/meta-oe/recipes-multimedia/live555/live555.inc b/meta-oe/recipes-multimedia/live555/live555.inc index 0d11de904f..710dbdec8c 100644 --- a/meta-oe/recipes-multimedia/live555/live555.inc +++ b/meta-oe/recipes-multimedia/live555/live555.inc | |||
@@ -9,7 +9,7 @@ SECTION = "devel" | |||
9 | 9 | ||
10 | INC_PR = "r1" | 10 | INC_PR = "r1" |
11 | 11 | ||
12 | URLV = "${@d.getVar('PV',1)[0:4]}.${@d.getVar('PV',1)[4:6]}.${@d.getVar('PV',1)[6:8]}" | 12 | URLV = "${@d.getVar('PV')[0:4]}.${@d.getVar('PV')[4:6]}.${@d.getVar('PV')[6:8]}" |
13 | SRC_URI = "http://www.live555.com/liveMedia/public/live.${URLV}.tar.gz \ | 13 | SRC_URI = "http://www.live555.com/liveMedia/public/live.${URLV}.tar.gz \ |
14 | file://config.linux-cross" | 14 | file://config.linux-cross" |
15 | # only latest live version stays on http://www.live555.com/liveMedia/public/, add mirror for older | 15 | # only latest live version stays on http://www.live555.com/liveMedia/public/, add mirror for older |
diff --git a/meta-oe/recipes-support/nano/nano.inc b/meta-oe/recipes-support/nano/nano.inc index 8a1d71f642..22f0fb2a0a 100644 --- a/meta-oe/recipes-support/nano/nano.inc +++ b/meta-oe/recipes-support/nano/nano.inc | |||
@@ -8,7 +8,7 @@ SECTION = "console/utils" | |||
8 | DEPENDS = "ncurses file" | 8 | DEPENDS = "ncurses file" |
9 | RDEPENDS_${PN} = "ncurses-terminfo" | 9 | RDEPENDS_${PN} = "ncurses-terminfo" |
10 | 10 | ||
11 | PV_MAJOR = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" | 11 | PV_MAJOR = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |
12 | 12 | ||
13 | SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" | 13 | SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" |
14 | 14 | ||
diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.44.bb b/meta-oe/recipes-support/openldap/openldap_2.4.44.bb index 645a5179c7..e8e0c857b5 100644 --- a/meta-oe/recipes-support/openldap/openldap_2.4.44.bb +++ b/meta-oe/recipes-support/openldap/openldap_2.4.44.bb | |||
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=c933fba6d89fda89f58df1e086e3f2e7 \ | |||
14 | " | 14 | " |
15 | SECTION = "libs" | 15 | SECTION = "libs" |
16 | 16 | ||
17 | LDAP_VER = "${@'.'.join(d.getVar('PV',1).split('.')[0:2])}" | 17 | LDAP_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" |
18 | 18 | ||
19 | SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${BP}.tgz \ | 19 | SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${BP}.tgz \ |
20 | file://openldap-m4-pthread.patch \ | 20 | file://openldap-m4-pthread.patch \ |
diff --git a/meta-oe/recipes-support/vim/vim_8.0.0022.bb b/meta-oe/recipes-support/vim/vim_8.0.0022.bb index 112ae80a25..126fe61628 100644 --- a/meta-oe/recipes-support/vim/vim_8.0.0022.bb +++ b/meta-oe/recipes-support/vim/vim_8.0.0022.bb | |||
@@ -14,7 +14,7 @@ SRCREV = "ec68a99464055029c01082762517e97245ddae0c" | |||
14 | 14 | ||
15 | S = "${WORKDIR}/git/src" | 15 | S = "${WORKDIR}/git/src" |
16 | 16 | ||
17 | VIMDIR = "vim${@d.getVar('PV',1).split('.')[0]}${@d.getVar('PV',1).split('.')[1]}" | 17 | VIMDIR = "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}" |
18 | 18 | ||
19 | inherit autotools update-alternatives | 19 | inherit autotools update-alternatives |
20 | inherit autotools-brokensep | 20 | inherit autotools-brokensep |