From 0fe3044a6b3bfc8bfdcdfb5b24093ea21b945655 Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Sat, 1 Oct 2016 13:48:03 -0500 Subject: [PATCH 1/3] source: Switch to xz for packages and tools where possible Changes git packages to xz Removes mirror checksums to avoid mismatches with tarballs as they differ due to checkout date and time of files. Changes a few source tarballs to xz if available upstream. Signed-off-by: Daniel Engberg --- package/boot/uboot-pxa/Makefile | 2 +- package/devel/trace-cmd/Makefile | 2 +- package/firmware/am33x-cm3/Makefile | 2 +- package/kernel/acx-mac80211/Makefile | 2 +- package/kernel/kmod-sched-cake/Makefile | 2 +- package/libs/libnftnl/Makefile | 2 +- package/libs/librpc/Makefile | 2 +- package/libs/libubox/Makefile | 2 +- package/libs/uclient/Makefile | 2 +- package/libs/ustream-ssl/Makefile | 2 +- package/network/config/firewall/Makefile | 2 +- package/network/config/netifd/Makefile | 2 +- package/network/ipv6/odhcp6c/Makefile | 2 +- package/network/services/authsae/Makefile | 2 +- package/network/services/hostapd/Makefile | 2 +- package/network/services/ipset-dns/Makefile | 2 +- package/network/services/mdns/Makefile | 2 +- package/network/services/odhcpd/Makefile | 2 +- package/network/services/omcproxy/Makefile | 2 +- package/network/services/openvpn-easy-rsa/Makefile | 2 +- package/network/services/relayd/Makefile | 2 +- package/network/services/uhttpd/Makefile | 2 +- package/network/utils/iwinfo/Makefile | 2 +- package/network/utils/nftables/Makefile | 2 +- package/network/utils/umbim/Makefile | 2 +- package/network/utils/uqmi/Makefile | 2 +- package/system/fstools/Makefile | 2 +- package/system/lede-keyring/Makefile | 2 +- package/system/mountd/Makefile | 2 +- package/system/opkg/Makefile | 2 +- package/system/procd/Makefile | 2 +- package/system/rpcd/Makefile | 2 +- package/system/ubox/Makefile | 2 +- package/system/ubus/Makefile | 2 +- package/system/uci/Makefile | 2 +- package/system/usign/Makefile | 2 +- package/utils/jsonfilter/Makefile | 2 +- package/utils/mtd-utils/Makefile | 2 +- package/utils/ugps/Makefile | 2 +- package/utils/usbmode/Makefile | 2 +- tools/b43-tools/Makefile | 4 ++-- tools/dosfstools/Makefile | 4 ++-- tools/libtool/Makefile | 4 ++-- tools/make-ext4fs/Makefile | 6 +++--- tools/mtd-utils/Makefile | 4 ++-- tools/sdimage/Makefile | 2 +- tools/upslug2/Makefile | 2 +- tools/xz/Makefile | 4 ++-- tools/yaffs2/Makefile | 4 ++-- 49 files changed, 57 insertions(+), 57 deletions(-) diff --git a/package/boot/uboot-pxa/Makefile b/package/boot/uboot-pxa/Makefile index 23e84c8647b3..1340a908a474 100644 --- a/package/boot/uboot-pxa/Makefile +++ b/package/boot/uboot-pxa/Makefile @@ -16,7 +16,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/ashcharles/verdex-uboot.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=ca6bf3ef6ac5f5132a359b43dfa31e07076b74b7 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_LICENSE:=GPL-2.0 GPL-2.0+ PKG_LICENSE_FILES:=Licenses/README diff --git a/package/devel/trace-cmd/Makefile b/package/devel/trace-cmd/Makefile index 939109267e72..c748896ce355 100644 --- a/package/devel/trace-cmd/Makefile +++ b/package/devel/trace-cmd/Makefile @@ -8,7 +8,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=01f8e669cb035aa911f1ee0e3f94d535cbcca78f -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz # PKG_MIRROR_MD5SUM:=6a08dfa2519a969d184e7bb5bb390620 PKG_INSTALL:=1 PKG_USE_MIPS16:=0 diff --git a/package/firmware/am33x-cm3/Makefile b/package/firmware/am33x-cm3/Makefile index 8bfeb4590028..56404985b6f5 100644 --- a/package/firmware/am33x-cm3/Makefile +++ b/package/firmware/am33x-cm3/Makefile @@ -12,7 +12,7 @@ PKG_VERSION:=20130304 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=http://arago-project.org/git/projects/am33x-cm3.git PKG_SOURCE_VERSION:=32cf44e25b5828b87af6dceebc3a49fed5d858ac diff --git a/package/kernel/acx-mac80211/Makefile b/package/kernel/acx-mac80211/Makefile index 8fce374d2b99..26ad085dfa1b 100644 --- a/package/kernel/acx-mac80211/Makefile +++ b/package/kernel/acx-mac80211/Makefile @@ -13,7 +13,7 @@ PKG_REV:=b6fc31491020cb01d2cd1acc170cfa03ced7e726 PKG_VERSION:=20140216 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://git.code.sf.net/p/acx100/acx-mac80211 PKG_SOURCE_PROTO:=git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) diff --git a/package/kernel/kmod-sched-cake/Makefile b/package/kernel/kmod-sched-cake/Makefile index 6108ed74ce81..d75f07c14a43 100644 --- a/package/kernel/kmod-sched-cake/Makefile +++ b/package/kernel/kmod-sched-cake/Makefile @@ -15,7 +15,7 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/dtaht/sch_cake.git -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Kevin Darbyshire-Bryant diff --git a/package/libs/libnftnl/Makefile b/package/libs/libnftnl/Makefile index 6919788e49f8..95bd1fcae68c 100644 --- a/package/libs/libnftnl/Makefile +++ b/package/libs/libnftnl/Makefile @@ -11,7 +11,7 @@ PKG_NAME:=libnftnl PKG_VERSION:=1.0.3 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=git://git.netfilter.org/libnftnl PKG_SOURCE_PROTO:=git diff --git a/package/libs/librpc/Makefile b/package/libs/librpc/Makefile index e1f7ad414d0e..b718d79ba85b 100644 --- a/package/libs/librpc/Makefile +++ b/package/libs/librpc/Makefile @@ -8,7 +8,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/librpc-uclibc.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=a921e3ded051746f9f7cd5e5a312fb6771716aac -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz CMAKE_INSTALL:=1 PKG_USE_MIPS16:=0 diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile index b3a065d11b53..b4afc5fb0540 100644 --- a/package/libs/libubox/Makefile +++ b/package/libs/libubox/Makefile @@ -8,7 +8,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/libubox.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=290c64ef5b5c3e75be851594f269d6a9568e64e5 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_MIRROR_MD5SUM:= CMAKE_INSTALL:=1 diff --git a/package/libs/uclient/Makefile b/package/libs/uclient/Makefile index 3816754e1269..23877a726c0a 100644 --- a/package/libs/uclient/Makefile +++ b/package/libs/uclient/Makefile @@ -8,7 +8,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/uclient.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=ccb314db2e99463de15eed9d7626360d82aec4d2 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_MIRROR_MD5SUM:= CMAKE_INSTALL:=1 diff --git a/package/libs/ustream-ssl/Makefile b/package/libs/ustream-ssl/Makefile index 214851592a68..b07339873ea9 100644 --- a/package/libs/ustream-ssl/Makefile +++ b/package/libs/ustream-ssl/Makefile @@ -8,7 +8,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/ustream-ssl.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=ec80adaa1b47f28d426fa19c692011ce60b992d6 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz CMAKE_INSTALL:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR) diff --git a/package/network/config/firewall/Makefile b/package/network/config/firewall/Makefile index 6e024af4096d..6f17456a7937 100644 --- a/package/network/config/firewall/Makefile +++ b/package/network/config/firewall/Makefile @@ -16,7 +16,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/firewall3.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=47b23946cb2d51c486cd01596744955f850e2060 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=ISC diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile index 801bcaa3e803..1effa5699296 100644 --- a/package/network/config/netifd/Makefile +++ b/package/network/config/netifd/Makefile @@ -8,7 +8,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/netifd.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=5479d6f1eefd1e5a7258b9eedbf92214a95db819 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_MAINTAINER:=Felix Fietkau # PKG_MIRROR_MD5SUM:= # CMAKE_INSTALL:=1 diff --git a/package/network/ipv6/odhcp6c/Makefile b/package/network/ipv6/odhcp6c/Makefile index 0dc771d374f3..ee4dbf5b4624 100644 --- a/package/network/ipv6/odhcp6c/Makefile +++ b/package/network/ipv6/odhcp6c/Makefile @@ -11,7 +11,7 @@ PKG_NAME:=odhcp6c PKG_VERSION:=2016-06-30 PKG_RELEASE=$(PKG_SOURCE_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/sbyx/odhcp6c.git PKG_SOURCE_PROTO:=git diff --git a/package/network/services/authsae/Makefile b/package/network/services/authsae/Makefile index df160544eeb2..8159b4001172 100644 --- a/package/network/services/authsae/Makefile +++ b/package/network/services/authsae/Makefile @@ -15,7 +15,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/cozybit/authsae.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=8531ab158910a525d4bcbb3ad02c08342f6987f2 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_BUILD_PARALLEL:=1 CMAKE_INSTALL:=1 diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile index b4684b691a4e..0a1d6a374e89 100644 --- a/package/network/services/hostapd/Makefile +++ b/package/network/services/hostapd/Makefile @@ -11,7 +11,7 @@ PKG_VERSION:=2016-09-05 PKG_RELEASE:=1 PKG_REV:=fcd85d9a3f2d9d63d0fa57e93446ad467db75b23 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://w1.fi/hostap.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=$(PKG_REV) diff --git a/package/network/services/ipset-dns/Makefile b/package/network/services/ipset-dns/Makefile index 1fa87ce9f1d7..cee0f5e7f994 100644 --- a/package/network/services/ipset-dns/Makefile +++ b/package/network/services/ipset-dns/Makefile @@ -15,7 +15,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://git.zx2c4.com/ipset-dns PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=6be3afd819a86136b51c5ae722ab48266187155b -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=GPL-2.0 diff --git a/package/network/services/mdns/Makefile b/package/network/services/mdns/Makefile index 624ada30fd24..543a3519884a 100644 --- a/package/network/services/mdns/Makefile +++ b/package/network/services/mdns/Makefile @@ -11,7 +11,7 @@ PKG_NAME:=mdns PKG_VERSION:=2016-05-23 PKG_RELEASE=$(PKG_SOURCE_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL=$(LEDE_GIT)/project/mdnsd.git PKG_SOURCE_PROTO:=git diff --git a/package/network/services/odhcpd/Makefile b/package/network/services/odhcpd/Makefile index c2e506ccd7b8..bbafe8f01bd4 100644 --- a/package/network/services/odhcpd/Makefile +++ b/package/network/services/odhcpd/Makefile @@ -11,7 +11,7 @@ PKG_NAME:=odhcpd PKG_VERSION:=2015-11-19 PKG_RELEASE=$(PKG_SOURCE_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/sbyx/odhcpd.git PKG_SOURCE_PROTO:=git diff --git a/package/network/services/omcproxy/Makefile b/package/network/services/omcproxy/Makefile index 75997fe6d605..6e7a6f22bfc2 100644 --- a/package/network/services/omcproxy/Makefile +++ b/package/network/services/omcproxy/Makefile @@ -11,7 +11,7 @@ PKG_NAME:=omcproxy PKG_VERSION:=2015-08-24 PKG_RELEASE:=3 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/sbyx/omcproxy.git PKG_SOURCE_PROTO:=git diff --git a/package/network/services/openvpn-easy-rsa/Makefile b/package/network/services/openvpn-easy-rsa/Makefile index fe03cbd075e6..ea1136d1dcca 100644 --- a/package/network/services/openvpn-easy-rsa/Makefile +++ b/package/network/services/openvpn-easy-rsa/Makefile @@ -16,7 +16,7 @@ PKG_RELEASE=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/OpenVPN/easy-rsa.git PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_REV).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_REV).tar.xz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_LICENSE:=GPL-2.0 diff --git a/package/network/services/relayd/Makefile b/package/network/services/relayd/Makefile index 6559770d0049..233cdb24b44b 100644 --- a/package/network/services/relayd/Makefile +++ b/package/network/services/relayd/Makefile @@ -11,7 +11,7 @@ PKG_NAME:=relayd PKG_VERSION:=2016-02-07 PKG_RELEASE=$(PKG_SOURCE_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL=$(LEDE_GIT)/project/relayd.git PKG_SOURCE_PROTO:=git diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile index 8a3797ed866d..dc95ada64a3a 100644 --- a/package/network/services/uhttpd/Makefile +++ b/package/network/services/uhttpd/Makefile @@ -15,7 +15,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/uhttpd.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=9d9f07142bbef1c63a79620967a847a9493105e5 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=ISC diff --git a/package/network/utils/iwinfo/Makefile b/package/network/utils/iwinfo/Makefile index 8d50d289e781..ce1086790f9c 100644 --- a/package/network/utils/iwinfo/Makefile +++ b/package/network/utils/iwinfo/Makefile @@ -14,7 +14,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/iwinfo.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=fd9e17be0c43bd6b8df5371f0b353747bc563874 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=GPL-2.0 diff --git a/package/network/utils/nftables/Makefile b/package/network/utils/nftables/Makefile index 96db6fff7043..1907e4d2160e 100644 --- a/package/network/utils/nftables/Makefile +++ b/package/network/utils/nftables/Makefile @@ -10,7 +10,7 @@ PKG_NAME:=nftables PKG_VERSION:=0.4+2015-04-09 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=git://git.netfilter.org/nftables PKG_SOURCE_PROTO:=git diff --git a/package/network/utils/umbim/Makefile b/package/network/utils/umbim/Makefile index 9330b00ec55c..055d6d90532c 100644 --- a/package/network/utils/umbim/Makefile +++ b/package/network/utils/umbim/Makefile @@ -8,7 +8,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/umbim.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=29aaf43b097ee57f7aa1bb24341db6cc4148cbf3 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_MAINTAINER:=John Crispin PKG_LICENSE:=GPL-2.0 diff --git a/package/network/utils/uqmi/Makefile b/package/network/utils/uqmi/Makefile index 1a4128acbf63..2ff9aadee14c 100644 --- a/package/network/utils/uqmi/Makefile +++ b/package/network/utils/uqmi/Makefile @@ -8,7 +8,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/uqmi.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=eb1dec7d0dc283a7f61aa574a443a0ab61f8793f -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_MAINTAINER:=Matti Laakso # PKG_MIRROR_MD5SUM:= # CMAKE_INSTALL:=1 diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile index bbd2e6d76ef9..a37f1bff1306 100644 --- a/package/system/fstools/Makefile +++ b/package/system/fstools/Makefile @@ -16,7 +16,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/fstools.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=fe514c9a20365ba00232c2c981463f43a4a41a7d -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 diff --git a/package/system/lede-keyring/Makefile b/package/system/lede-keyring/Makefile index 5ac8e935e859..81aa442655ab 100644 --- a/package/system/lede-keyring/Makefile +++ b/package/system/lede-keyring/Makefile @@ -11,7 +11,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/keyring.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=5c7857eed3fa06a9005f96b9b029388c7f316e83 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_MAINTAINER:=John Crispin PKG_LICENSE:=GPL-2.0 diff --git a/package/system/mountd/Makefile b/package/system/mountd/Makefile index 301762778b96..c8cae30e351f 100644 --- a/package/system/mountd/Makefile +++ b/package/system/mountd/Makefile @@ -12,7 +12,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/mountd.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=d8145d1f78651f0ff4d53b7f2ccc89daeab4561b -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz CMAKE_INSTALL:=1 PKG_MAINTAINER:=John Crispin diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile index 67ceb7cafc23..8182cef4529a 100644 --- a/package/system/opkg/Makefile +++ b/package/system/opkg/Makefile @@ -19,7 +19,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=$(PKG_REV) PKG_SOURCE_SUBDIR:=opkg-$(PKG_VERSION) PKG_SOURCE_URL:=http://git.yoctoproject.org/git/opkg -PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz +PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.xz PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_FIXUP:=autoreconf PKG_REMOVE_FILES = autogen.sh aclocal.m4 diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index c08ce727cf9a..7ae654bc4f2f 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -16,7 +16,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/procd.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=72f63807b3644ef7b8ab9025a02d7f509f39ad14 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 diff --git a/package/system/rpcd/Makefile b/package/system/rpcd/Makefile index 554abfe451e0..d1d3491681ca 100644 --- a/package/system/rpcd/Makefile +++ b/package/system/rpcd/Makefile @@ -15,7 +15,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/rpcd.git PKG_SOURCE_SUBDIR:=$(PKG_NAME) PKG_SOURCE_VERSION:=23417e94d25570e6d62542bac46edd51e8e0243a -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=ISC diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile index 9f0c4dc10250..3e26032e29c6 100644 --- a/package/system/ubox/Makefile +++ b/package/system/ubox/Makefile @@ -8,7 +8,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/ubox.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=34c597b8f478a4937fa041bf9da988990314ea85 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 diff --git a/package/system/ubus/Makefile b/package/system/ubus/Makefile index 928c3de4f885..0d8d8630cc68 100644 --- a/package/system/ubus/Makefile +++ b/package/system/ubus/Makefile @@ -8,7 +8,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/ubus.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=686c05d738a7a1f7ec62c47807f07f6f642904b1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_MIRROR_MD5SUM:= CMAKE_INSTALL:=1 diff --git a/package/system/uci/Makefile b/package/system/uci/Makefile index f364b76f18fa..7d0c52c5e942 100644 --- a/package/system/uci/Makefile +++ b/package/system/uci/Makefile @@ -16,7 +16,7 @@ PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE)) PKG_RELEASE:=1 PKG_REV:=e1bf4356e1b513e158e1b5049147087ed6342cfd -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL=$(LEDE_GIT)/project/uci.git PKG_SOURCE_SUBDIR:=uci-$(PKG_VERSION) PKG_SOURCE_VERSION:=$(PKG_REV) diff --git a/package/system/usign/Makefile b/package/system/usign/Makefile index e9eb84ec3163..df600ff6d822 100644 --- a/package/system/usign/Makefile +++ b/package/system/usign/Makefile @@ -8,7 +8,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/usign.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=ef6419142a3b0fbcddcccf536e3c1880302c6f89 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz CMAKE_INSTALL:=1 PKG_CHECK_FORMAT_SECURITY:=1 PKG_USE_MIPS16:=0 diff --git a/package/utils/jsonfilter/Makefile b/package/utils/jsonfilter/Makefile index 975befcce421..28d4bb8e7a47 100644 --- a/package/utils/jsonfilter/Makefile +++ b/package/utils/jsonfilter/Makefile @@ -8,7 +8,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/jsonpath.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=dea067ad67d977c247c300c06676a06adf21e0c7 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz CMAKE_INSTALL:=1 PKG_MAINTAINER:=Jo-Philipp Wich diff --git a/package/utils/mtd-utils/Makefile b/package/utils/mtd-utils/Makefile index 56b867908928..fdf61e4ea566 100644 --- a/package/utils/mtd-utils/Makefile +++ b/package/utils/mtd-utils/Makefile @@ -12,7 +12,7 @@ PKG_REV:=aea36417067dade75192bafa03af70b6eb2677b1 PKG_VERSION:=1.5.2 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=git://git.infradead.org/mtd-utils.git PKG_SOURCE_PROTO:=git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) diff --git a/package/utils/ugps/Makefile b/package/utils/ugps/Makefile index 640579eaace0..dc6ef2e89a8d 100644 --- a/package/utils/ugps/Makefile +++ b/package/utils/ugps/Makefile @@ -15,7 +15,7 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL=$(LEDE_GIT)/project/ugps.git PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=51b808cdd323c802847885421dd18897afaae210 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_MAINTAINER:=John Crispin PKG_LICENSE:=GPL-2.0+ diff --git a/package/utils/usbmode/Makefile b/package/utils/usbmode/Makefile index 4b481126b3b1..297450341422 100644 --- a/package/utils/usbmode/Makefile +++ b/package/utils/usbmode/Makefile @@ -8,7 +8,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/usbmode.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=993a9a542791953c4804f7ddbb3a07756738e37a -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 diff --git a/tools/b43-tools/Makefile b/tools/b43-tools/Makefile index 28a33d6a5561..67a81ac63df1 100644 --- a/tools/b43-tools/Makefile +++ b/tools/b43-tools/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=b43-tools PKG_VERSION:=019 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/mbuesch/b43-tools.git PKG_SOURCE_PROTO:=git PKG_SOURCE_SUBDIR:=$(PKG_NAME) PKG_SOURCE_VERSION:=8dce53297966b31b6c70a7a03c2433978dd9f288 -#PKG_MIRROR_MD5SUM:=50ca3c763ee21ee213addd17cf1c1b86 +PKG_MIRROR_MD5SUM:= HOST_BUILD_DIR=$(BUILD_DIR_HOST)/$(PKG_NAME) include $(INCLUDE_DIR)/host-build.mk diff --git a/tools/dosfstools/Makefile b/tools/dosfstools/Makefile index 7b1e22e89414..8584a0506c7e 100644 --- a/tools/dosfstools/Makefile +++ b/tools/dosfstools/Makefile @@ -10,10 +10,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dosfstools PKG_VERSION:=4.0 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/dosfstools/dosfstools/releases/download/v$(PKG_VERSION)/ \ http://fossies.org/linux/misc -PKG_MD5SUM:=d96f46cbc5b84ad4c9766b4fbf6c8e09 +PKG_MD5SUM:=20f8388b99702f276c973d228c7cff45 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION) diff --git a/tools/libtool/Makefile b/tools/libtool/Makefile index 9fab8d94fd59..e418005ee6bf 100644 --- a/tools/libtool/Makefile +++ b/tools/libtool/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtool PKG_VERSION:=2.4 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) -PKG_MD5SUM:=b32b04148ecdd7344abc6fe8bd1bb021 +PKG_MD5SUM:=4e6144439d95d7332dc50ace6dd24c55 HOST_BUILD_PARALLEL:=1 diff --git a/tools/make-ext4fs/Makefile b/tools/make-ext4fs/Makefile index f74f602ec984..57b228e4a0b2 100644 --- a/tools/make-ext4fs/Makefile +++ b/tools/make-ext4fs/Makefile @@ -10,13 +10,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=make-ext4fs PKG_VERSION:=2016-08-14 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL=$(LEDE_GIT)/project/make_ext4fs.git PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=484903e4332be6c317f531b008cb2a841a18c506 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_MIRROR_MD5SUM:=b80d6ddcd6f6925e2f5b80775bb96f3e -PKG_CAT:=zcat +PKG_MIRROR_MD5SUM:= +# PKG_CAT:=zcat HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION) diff --git a/tools/mtd-utils/Makefile b/tools/mtd-utils/Makefile index 6a3518fc1800..9373a4e74ed9 100644 --- a/tools/mtd-utils/Makefile +++ b/tools/mtd-utils/Makefile @@ -10,12 +10,12 @@ PKG_NAME:=mtd-utils PKG_VERSION:=1.5.2 PKG_SOURCE_VERSION:=aea36417067dade75192bafa03af70b6eb2677b1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_SOURCE_URL:=git://git.infradead.org/mtd-utils.git PKG_SOURCE_PROTO:=git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_MIRROR_MD5SUM:= -PKG_CAT:=zcat +# PKG_CAT:=zcat HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION) diff --git a/tools/sdimage/Makefile b/tools/sdimage/Makefile index e5904177454d..52c2b41cf22e 100644 --- a/tools/sdimage/Makefile +++ b/tools/sdimage/Makefile @@ -14,7 +14,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/mhei/fsl-imx-uuc.git PKG_SOURCE_VERSION:=2b99403b6dc60a22b07eb7a5cc0cb184abb89bdd PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.xz PKG_LICENSE:=GPL-2.0+ PKG_LICENSE_FILES:=LICENSE diff --git a/tools/upslug2/Makefile b/tools/upslug2/Makefile index 33b1ff5a42bb..b28f9efab95f 100644 --- a/tools/upslug2/Makefile +++ b/tools/upslug2/Makefile @@ -13,7 +13,7 @@ PKG_SOURCE_URL:=http://svn.nslu2-linux.org/svnroot/upslug2/trunk PKG_SOURCE_PROTO:=svn PKG_SOURCE_SUBDIR:=upslug2-$(PKG_VERSION) PKG_SOURCE_VERSION:=41 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz include $(INCLUDE_DIR)/host-build.mk diff --git a/tools/xz/Makefile b/tools/xz/Makefile index ce67acf64539..e59c2b1de8cf 100644 --- a/tools/xz/Makefile +++ b/tools/xz/Makefile @@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xz PKG_VERSION:=5.2.2 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://tukaani.org/xz \ http://fossies.org/linux/misc -PKG_MD5SUM:=f90c9a0c8b259aee2234c4e0d7fd70af +PKG_MD5SUM:=e26772b69940085c0632589ab1d52e64 HOST_BUILD_PARALLEL:=1 diff --git a/tools/yaffs2/Makefile b/tools/yaffs2/Makefile index bc98a6c8f52e..68fd79812d66 100644 --- a/tools/yaffs2/Makefile +++ b/tools/yaffs2/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=yaffs2_android PKG_VERSION:=2008-12-18 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://android.googlesource.com/platform/external/yaffs2 PKG_SOURCE_PROTO:=git PKG_SOURCE_SUBDIR:=$(PKG_NAME) PKG_SOURCE_VERSION:=d333fc232d7e5ae3370080d5d6f7d88ea9c6b3a1 -PKG_MIRROR_MD5SUM:=8145d4dd9b46face26121f27ad60cc1c +PKG_MIRROR_MD5SUM:= HOST_BUILD_DIR=$(BUILD_DIR_HOST)/$(PKG_NAME) include $(INCLUDE_DIR)/host-build.mk From d2fc6456d61af534fccefea84a96487c1928c42d Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Mon, 3 Oct 2016 15:35:08 -0500 Subject: [PATCH 2/3] include/prereq-build.mk: Add xz-utils to make prereq Add xz-utils to make prereq Signed-off-by: Daniel Engberg --- include/prereq-build.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 9c0717d53a8b..07bcbde71ed8 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -160,6 +160,9 @@ $(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.7.12.2, \ $(eval $(call SetupHostCommand,file,Please install the 'file' package, \ file --version 2>&1 | grep file)) +$(eval $(call SetupHostCommand,xz,Please install xz-utils, \ + xz --version | grep XZ)) + ifneq ($(HOST_OS),Darwin) $(eval $(call SetupHostCommand,openssl,Please install the 'openssl' utility, \ openssl version | grep '\(OpenSSL\|LibreSSL\)')) From 5a1ad9547498cdf25d9521a46922b2421ce06772 Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Mon, 3 Oct 2016 15:37:39 -0500 Subject: [PATCH 3/3] include/download.mk: Use -7e compression instead of -6 by default Adds a slightly higher compression level to xz by default which roughly raises memory usage from 100MiB to about 200MiB during compression, about 10MiB for decompression. (Source: xz manpage) Signed-off-by: Daniel Engberg --- include/download.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/download.mk b/include/download.mk index 74e2c317d6ce..59f0ec69fa7d 100644 --- a/include/download.mk +++ b/include/download.mk @@ -35,7 +35,7 @@ endef # code for creating tarballs from cvs/svn/git/bzr/hg/darcs checkouts - useful for mirror support dl_pack/bz2=$(TAR) cjf $(1) $(2) dl_pack/gz=$(TAR) czf $(1) $(2) -dl_pack/xz=$(TAR) c $(2) | xz -zc > $(1) +dl_pack/xz=$(TAR) c $(2) | xz -zc -7e > $(1) dl_pack/unknown=echo "ERROR: Unknown pack format for file $(1)"; false define dl_pack $(if $(dl_pack/$(call ext,$(1))),$(dl_pack/$(call ext,$(1))),$(dl_pack/unknown))