classes/gnomebase: change tarball compression to xz

Upstream, xz has been the only format for some time now, so let's
make it the default and adjust recipes that package old stuff.

(From OE-Core rev: 0f9ea90dde8f63aace19531e066580e41bf3d7cc)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2015-06-10 15:39:40 +03:00
committed by Richard Purdie
parent 7ce920920d
commit 429985c1f6
13 changed files with 6 additions and 19 deletions

View File

@@ -1,7 +1,7 @@
def gnome_verdir(v): def gnome_verdir(v):
return oe.utils.trim_version(v, 2) return oe.utils.trim_version(v, 2)
GNOME_COMPRESS_TYPE ?= "bz2" GNOME_COMPRESS_TYPE ?= "xz"
SECTION ?= "x11/gnome" SECTION ?= "x11/gnome"
GNOMEBN ?= "${BPN}" GNOMEBN ?= "${BPN}"
SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive" SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive"

View File

@@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
SECTION = "libs" SECTION = "libs"
DEPENDS = "glib-2.0 intltool-native" DEPENDS = "glib-2.0 intltool-native"
GNOME_COMPRESS_TYPE = "xz"
SRC_URI[archive.md5sum] = "6989b20cf3b26dd5ae272e04a9acb0b3" SRC_URI[archive.md5sum] = "6989b20cf3b26dd5ae272e04a9acb0b3"
SRC_URI[archive.sha256sum] = "8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346" SRC_URI[archive.sha256sum] = "8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346"

View File

@@ -8,8 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SECTION = "x11/gnome" SECTION = "x11/gnome"
inherit gnomebase allarch inherit gnomebase allarch
GNOME_COMPRESS_TYPE = "xz"
SRC_URI[archive.md5sum] = "ba58c61d0d81b7c3ff8452c620513a9d" SRC_URI[archive.md5sum] = "ba58c61d0d81b7c3ff8452c620513a9d"
SRC_URI[archive.sha256sum] = "4c00242f781bb441289f49dd80ed1d895d84de0c94bfc2c6818a104c9e39262c" SRC_URI[archive.sha256sum] = "4c00242f781bb441289f49dd80ed1d895d84de0c94bfc2c6818a104c9e39262c"

View File

@@ -2,8 +2,6 @@ require gnome-doc-utils.inc
LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \
file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343" file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343"
GNOME_COMPRESS_TYPE = "xz"
SRC_URI += "file://xsltproc_nonet.patch \ SRC_URI += "file://xsltproc_nonet.patch \
file://use-usr-bin-env-for-python-in-xml2po.patch \ file://use-usr-bin-env-for-python-in-xml2po.patch \
file://sysrooted-pkg-config.patch \ file://sysrooted-pkg-config.patch \

View File

@@ -13,6 +13,7 @@ SRC_URI += "file://pkgconfig.patch"
SRC_URI[archive.md5sum] = "541858188f80090d12a33b5a7c34d42c" SRC_URI[archive.md5sum] = "541858188f80090d12a33b5a7c34d42c"
SRC_URI[archive.sha256sum] = "37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7" SRC_URI[archive.sha256sum] = "37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7"
GNOME_COMPRESS_TYPE="bz2"
DEPENDS += "shared-mime-info intltool-native" DEPENDS += "shared-mime-info intltool-native"
RDEPENDS_${PN} = "shared-mime-info" RDEPENDS_${PN} = "shared-mime-info"

View File

@@ -32,6 +32,7 @@ CFLAGS_prepend = "-DHAVE_ANIMATION "
RDEPENDS_${PN}-dev = "" RDEPENDS_${PN}-dev = ""
inherit gnomebase inherit gnomebase
GNOME_COMPRESS_TYPE="bz2"
python populate_packages_prepend() { python populate_packages_prepend() {
engines_root = os.path.join(d.getVar('libdir', True), "gtk-2.0/2.10.0/engines") engines_root = os.path.join(d.getVar('libdir', True), "gtk-2.0/2.10.0/engines")

View File

@@ -10,8 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
DEPENDS = "glib-2.0" DEPENDS = "glib-2.0"
GNOME_COMPRESS_TYPE = "xz"
SRC_URI[archive.md5sum] = "3131b0417ecde3da1ae72acceaa375cf" SRC_URI[archive.md5sum] = "3131b0417ecde3da1ae72acceaa375cf"
SRC_URI[archive.sha256sum] = "80f3593cb6bd13f1465828e46a9f740e2e9bd3cd2257889442b3e62bd6de05cd" SRC_URI[archive.sha256sum] = "80f3593cb6bd13f1465828e46a9f740e2e9bd3cd2257889442b3e62bd6de05cd"

View File

@@ -12,6 +12,7 @@ PR = "r5"
DEPENDS = "zlib gdk-pixbuf gtk+" DEPENDS = "zlib gdk-pixbuf gtk+"
inherit autotools pkgconfig gnomebase gtk-doc inherit autotools pkgconfig gnomebase gtk-doc
GNOME_COMPRESS_TYPE="bz2"
SRC_URI += "file://glade-cruft.patch file://no-xml2.patch file://python_environment.patch" SRC_URI += "file://glade-cruft.patch file://no-xml2.patch file://python_environment.patch"

View File

@@ -12,8 +12,6 @@ BBCLASSEXTEND = "native"
inherit autotools pkgconfig gnomebase gtk-doc pixbufcache inherit autotools pkgconfig gnomebase gtk-doc pixbufcache
GNOME_COMPRESS_TYPE = "xz"
SRC_URI += "file://gtk-option.patch" SRC_URI += "file://gtk-option.patch"
SRC_URI[archive.md5sum] = "fadebe2e799ab159169ee3198415ff85" SRC_URI[archive.md5sum] = "fadebe2e799ab159169ee3198415ff85"

View File

@@ -2,8 +2,6 @@ require pango.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
GNOME_COMPRESS_TYPE="xz"
SRC_URI += "file://run-ptest \ SRC_URI += "file://run-ptest \
file://multilib-fix-clean.patch \ file://multilib-fix-clean.patch \
" "

View File

@@ -12,8 +12,6 @@ DEPENDS = "glib-2.0"
inherit gnomebase gtk-doc inherit gnomebase gtk-doc
GNOME_COMPRESS_TYPE = "xz"
SRC_URI[archive.md5sum] = "c7c5002bd6e58b4723a165f1bf312116" SRC_URI[archive.md5sum] = "c7c5002bd6e58b4723a165f1bf312116"
SRC_URI[archive.sha256sum] = "095f986060a6a0b22eb15eef84ae9f14a1cf8082488faa6886d94c37438ae562" SRC_URI[archive.sha256sum] = "095f986060a6a0b22eb15eef84ae9f14a1cf8082488faa6886d94c37438ae562"

View File

@@ -17,7 +17,5 @@ BINCONFIG = "${bindir}/croco-0.6-config"
inherit autotools pkgconfig gnomebase gtk-doc binconfig-disabled inherit autotools pkgconfig gnomebase gtk-doc binconfig-disabled
GNOME_COMPRESS_TYPE = "xz"
SRC_URI[archive.md5sum] = "767e73c4174f75b99695d4530fd9bb80" SRC_URI[archive.md5sum] = "767e73c4174f75b99695d4530fd9bb80"
SRC_URI[archive.sha256sum] = "ea6e1b858c55219cefd7109756bff5bc1a774ba7a55f7d3ccd734d6b871b8570" SRC_URI[archive.sha256sum] = "ea6e1b858c55219cefd7109756bff5bc1a774ba7a55f7d3ccd734d6b871b8570"

View File

@@ -8,5 +8,5 @@ SRC_URI += "file://obsolete_automake_macros.patch"
CFLAGS += "-D_GNU_SOURCE" CFLAGS += "-D_GNU_SOURCE"
SRC_URI[archive.md5sum] = "f07a4bf943194f94b7f142db8f7f36dc" SRC_URI[archive.md5sum] = "497f26e457308649e6ece32b3bb142ff"
SRC_URI[archive.sha256sum] = "8d04e202b617373dfb47689e5e628febe2c58840b34cccc4af4feb88c48df903" SRC_URI[archive.sha256sum] = "86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae"