Skip to content

Commit

Permalink
tools: use 'xz' versions of packages
Browse files Browse the repository at this point in the history
There is a discrepancy between `packages` and `tools` where the same
package is essentially downloaded twice due to different extensions. ('gz' vs 'xz').

```
dl/e2fsprogs-1.47.0.tar.gz          dl/e2fsprogs-1.47.0.tar.xz
dl/gmp-6.3.0.tar.gz                 dl/gmp-6.3.0.tar.xz
dl/libtool-2.4.7.tar.gz             dl/libtool-2.4.7.tar.xz
dl/sed-4.9.tar.gz                   dl/sed-4.9.tar.xz
dl/util-linux-2.39.3.tar.gz         dl/util-linux-2.39.3.tar.xz
dl/zlib-1.3.1.tar.gz                dl/zlib-1.3.1.tar.xz
dl/zstd-1.5.5.tar.gz                dl/zstd-1.5.6.tar.gz
```

Initially I thought this was due to the build needing to compile 'xz'
before it could use it, but 'xz' is already an OS build requirement and
is already in use by other tool packages.

```
tools/7z/Makefile:PKG_SOURCE:=$(PKG_NAME)$(PKG_SOURCE_VERSION)-src.tar.xz
tools/autoconf-archive/Makefile:PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
tools/findutils/Makefile:PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
tools/gengetopt/Makefile:PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
tools/llvm-bpf/Makefile:PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).src.tar.xz
tools/mklibs/Makefile:PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz
tools/sed/Makefile:PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
```

Signed-off-by: Sean Khan <[email protected]>
  • Loading branch information
qosmio committed Apr 11, 2024
1 parent 076f945 commit a4003b4
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions tools/e2fsprogs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=e2fsprogs
PKG_CPE_ID:=cpe:/a:e2fsprogs_project:e2fsprogs
PKG_VERSION:=1.47.0
PKG_HASH:=0b4fe723d779b0927fb83c9ae709bc7b40f66d7df36433bef143e41c54257084
PKG_HASH:=144af53f2bbd921cef6f8bea88bb9faddca865da3fbc657cc9b4d2001097d5db
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/

HOST_BUILD_PARALLEL:=1
Expand Down
6 changes: 3 additions & 3 deletions tools/gmp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gmp
PKG_VERSION:=6.3.0

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/gmp/
PKG_HASH:=e56fd59d76810932a0555aa15a14b61c16bed66110d3c75cc2ac49ddaa9ab24c
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)$(PKG_REVISION).tar.xz
PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
PKG_HASH:=a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898
PKG_CPE_ID:=cpe:/a:gmplib:gmp

HOST_FIXUP:=autoreconf
Expand Down
4 changes: 2 additions & 2 deletions tools/libtool/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ PKG_NAME:=libtool
PKG_CPE_ID:=cpe:/a:gnu:libtool
PKG_VERSION:=2.4.7

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
PKG_HASH:=04e96c2404ea70c590c546eba4202a4e12722c640016c12b9b2f1ce3d481e9a8
PKG_HASH:=4f7f217f057ce655ff22559ad221a0fd8ef84ad1fc5fcb6990cecc333aa1635d

HOST_BUILD_PARALLEL:=1

Expand Down
4 changes: 2 additions & 2 deletions tools/sed/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=sed
PKG_VERSION:=4.9

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
PKG_HASH:=d1478a18f033a73ac16822901f6533d30b6be561bcbce46ffd7abce93602282e
PKG_HASH:=6e226b732e1cd739464ad6862bd1a1aba42d7982922da7a53519631d24975181
PKG_CPE_ID:=cpe:/a:gnu:sed

export SED:=
Expand Down
4 changes: 2 additions & 2 deletions tools/util-linux/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=util-linux
PKG_VERSION:=2.39.3

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.39
PKG_HASH:=40ea07584d56c310455471afa92c119ec259776a561af7159cc802344c2c370d
PKG_HASH:=7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f
PKG_CPE_ID:=cpe:/a:kernel:util-linux

HOST_BUILD_PARALLEL:=1
Expand Down
4 changes: 2 additions & 2 deletions tools/zlib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ PKG_NAME:=zlib
PKG_VERSION:=1.3.1
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/madler/zlib/releases/download/v$(PKG_VERSION)
PKG_HASH:=9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
PKG_HASH:=38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32

PKG_LICENSE:=Zlib
PKG_LICENSE_FILES:=README
Expand Down

0 comments on commit a4003b4

Please sign in to comment.