summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/default-providers.inc1
-rw-r--r--meta/recipes-extended/pigz/pigz_2.4.bb21
2 files changed, 21 insertions, 1 deletions
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index 21419038f0..2be3378773 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -42,6 +42,7 @@ PREFERRED_PROVIDER_opkg ?= "opkg"
42PREFERRED_PROVIDER_opkg-native ?= "opkg-native" 42PREFERRED_PROVIDER_opkg-native ?= "opkg-native"
43PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg" 43PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg"
44PREFERRED_PROVIDER_console-tools ?= "kbd" 44PREFERRED_PROVIDER_console-tools ?= "kbd"
45PREFERRED_PROVIDER_gzip-native ?= "pigz-native"
45PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}" 46PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}"
46PREFERRED_RPROVIDER_bluez-hcidump ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez-hcidump',d)}" 47PREFERRED_RPROVIDER_bluez-hcidump ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez-hcidump',d)}"
47# Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb 48# Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb
diff --git a/meta/recipes-extended/pigz/pigz_2.4.bb b/meta/recipes-extended/pigz/pigz_2.4.bb
index 6e6da9c3c5..974c035147 100644
--- a/meta/recipes-extended/pigz/pigz_2.4.bb
+++ b/meta/recipes-extended/pigz/pigz_2.4.bb
@@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = "file://pigz.c;md5=9ae6dee8ceba9610596ed0ada493d142;beginline
11SRC_URI = "http://zlib.net/${BPN}/fossils/${BP}.tar.gz" 11SRC_URI = "http://zlib.net/${BPN}/fossils/${BP}.tar.gz"
12SRC_URI[md5sum] = "def2f6e19d9d8231445adc1349d346df" 12SRC_URI[md5sum] = "def2f6e19d9d8231445adc1349d346df"
13SRC_URI[sha256sum] = "a4f816222a7b4269bd232680590b579ccc72591f1bb5adafcd7208ca77e14f73" 13SRC_URI[sha256sum] = "a4f816222a7b4269bd232680590b579ccc72591f1bb5adafcd7208ca77e14f73"
14PROVIDES_class-native += "gzip-native"
15
14# Point this at the homepage in case /fossils/ isn't updated 16# Point this at the homepage in case /fossils/ isn't updated
15UPSTREAM_CHECK_URI = "http://zlib.net/${BPN}/" 17UPSTREAM_CHECK_URI = "http://zlib.net/${BPN}/"
16UPSTREAM_CHECK_REGEX = "pigz-(?P<pver>.*)\.tar" 18UPSTREAM_CHECK_REGEX = "pigz-(?P<pver>.*)\.tar"
@@ -19,7 +21,9 @@ DEPENDS = "zlib"
19 21
20EXTRA_OEMAKE = "-e MAKEFLAGS=" 22EXTRA_OEMAKE = "-e MAKEFLAGS="
21 23
22do_install() { 24inherit update-alternatives
25
26do_install_class-target() {
23 # Install files into /bin (FHS), which is typical place for gzip 27 # Install files into /bin (FHS), which is typical place for gzip
24 install -d ${D}${base_bindir} 28 install -d ${D}${base_bindir}
25 install ${B}/pigz ${D}${base_bindir}/pigz 29 install ${B}/pigz ${D}${base_bindir}/pigz
@@ -27,4 +31,19 @@ do_install() {
27 ln -nsf pigz ${D}${base_bindir}/pigzcat 31 ln -nsf pigz ${D}${base_bindir}/pigzcat
28} 32}
29 33
34do_install() {
35 install -d ${D}${bindir}
36 install ${B}/pigz ${D}${bindir}/gzip
37 ln -nsf gzip ${D}${bindir}/gunzip
38 ln -nsf gzip ${D}${bindir}/zcat
39}
40
41ALTERNATIVE_PRIORITY = "80"
42ALTERNATIVE_${PN} = "gunzip gzip zcat"
43ALTERNATIVE_${PN}_class-nativesdk = ""
44ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip"
45ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip"
46ALTERNATIVE_LINK_NAME[zcat] = "${base_bindir}/zcat"
47ALTERNATIVE_TARGET = "${base_bindir}/pigz"
48
30BBCLASSEXTEND = "native nativesdk" 49BBCLASSEXTEND = "native nativesdk"