0a150e97d4
This updates: * m4 * bison * e2fsprogs * make_ext4fs * mtd-utils * findutils * squashfs * squashfs4 * grub2 to their version used in LEDE v17.01.6. This fixes various compile errors appearing on Debian Sid. A list of the patches picked from upstream: m4: $ git log --oneline f7e56763e1..HEAD tools/m4 6e78c5502c tools: m4: fix compilation with glibc 2.28 a91d8dd162 tools/m4: update 1.4.18 f19d47f848 tools: patch various gnu tools for macOS 10.13 720b99215d treewide: clean up download hashes bison: $ git log --oneline 877f2972d4..HEAD tools/bison 1e09cbf118 tools/bison: Update to 3.0.5 f19d47f848 tools: patch various gnu tools for macOS 10.13 720b99215d treewide: clean up download hashes 5062cff673 tools/bison: update to 3.0.4 e2fsprogs: $ git log --oneline f7e56763e1..HEAD tools/e2fsprogs/ 8f5c55f63e tools/e2fsprogs: update to 1.44.1 d35a7bf4b4 e2fsprogs: bump to 1.44.0 79ac69d9c9 tools/e2fsprogs: Update to 1.43.7 5d9114c9cb tools/e2fsprogs: Update to 1.43.6 7955fab22a tools/e2fsprogs: Update to 1.43.5 866e5b4956 tools/e2fsprogs: Update to 1.43.4 a964738a5c Revert "tools/e2fsprogs: fix building on a glibc 2.27 host" 58a95f0f8f tools/e2fsprogs: fix building on a glibc 2.27 host 720b99215d treewide: clean up download hashes b8b807b1a9 tools/e2fsprogs: Update to 1.43.3 d635ef50c5 e2fsprogs: fix build problem with very old libmagic 819cf75c40 tools: e2fsprogs: bump to 1.43.1 2baf90a84e tools/e2fsprogs: remove outdated configure args b7e946f33e tools/e2fsprogs: update to 1.42.13 52ea491bdf tools/e2fsprogs: add a darwin-compat patch make-ext4fs: $ git log --oneline 1170a3de76..HEAD tools/make-ext4fs/ c7c1cf5618 treewide: clean up and unify PKG_VERSION for git based downloads 720b99215d treewide: clean up download hashes 9edfe7dd13 source: Switch to xz for packages and tools where possible 95bad62f2a tools: make_ext4fs: switch to LEDE git mirror 98b960c218 tools: make_ext4fs: support creating empty filesystem images 9ec4ca525c tools: make-ext4fs: fix build regression on mac os x 49ad0c565a tools: fix make_ext4fs build with recent glibc 8af9119ff4 tools: make-ext4fs: explicitely request C collation for sorting 01fb448d56 tools/make-ext4fs: prefer static linking $ git log --oneline 17ae95bb20..HEAD tools/mtd-utils 96dbf59e5a tools/mtd-utils: include sysmacros.h explicitly 018d80007e kernel: remove ubifs xz decompression support c7c1cf5618 treewide: clean up and unify PKG_VERSION for git based downloads 720b99215d treewide: clean up download hashes 9edfe7dd13 source: Switch to xz for packages and tools where possible e27c8bb156 update mtd-utils to 1.5.2 $ git log --oneline dd86bc73fb..HEAD tools/findutils 6449ed1553 tools: findutils: fix compilation with glibc 2.28 d2fd6412a6 tools/findutils: include sysmacros.h explicitly 720b99215d treewide: clean up download hashes 70a5c062f1 tools/findutils: Update to 4.6.0 $ git log --oneline f7e56763e1..HEAD tools/squashfs tools/squashfs4 1aedf2f149 tools/squashfs: use host cflags 8a48a53dcb tools/squashfs4: include sysmacros.h explicitly 8406e50df5 tools/squashfs: include sysmacros.h explicitly 720b99215d treewide: clean up download hashes f97ad870e1 squashfs4: use upstream xz compression header format d437c72c21 tools/squashfs4: refresh patches 34124de139 tools/squashfs: refresh patches fd1c1b4918 tools/squashfs: add argument -fixed-time to set all timestamps $ git log --oneline fcc6f801ca..HEAD package/boot/grub2/ 2252731af4 grub2: rebase patches 6aae528cc3 grub2: Fix CVE-2015-8370 6e1e2e7b96 package/grub2: update to 2.02 10182cb2c6 grub2: update to 2.02~rc2 f0e8470aa9 grub2: update to 2.02~rc1 806d3cc2c3 packages: mark packages depending on a target as nonshared 65c8f2890c grub2: upgrade to 2.02-beta3 (3 years newer than previous) 77812cdfec grub2: disable 'check-macro-version' build rule in 'po' build 2b54fa4dff grub2: do not generate mkfonts at build time b33845b2da grub2: add PKG_FIXUP:=autoreconf 720b99215d treewide: clean up download hashes 3c52cbfa53 Revert "grub2: add PKG_FIXUP:=autoreconf" a0ea22ac43 grub2: add PKG_FIXUP:=autoreconf f2752f4735 grub2: add missing SECTION variable and remove non breaking space d140648622 grub2: move to Boot Loaders category 59e3a4714a grub2: switch back to installing to STAGING_DIR_HOST 9b01282515 grub2: disable stack-protector 25eddec9cb grub2: fix build against musl $ git log --oneline 81a2f9d6f86 81a2f9d6f8 target/linux/x86/image: add explicit prefix to grub-mkimage command Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
83 lines
3.1 KiB
Diff
83 lines
3.1 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Wed, 21 Dec 2016 16:39:56 +0100
|
|
Subject: build: add defaults for PKG_SOURCE, PKG_SOURCE_SUBDIR, PKG_VERSION
|
|
|
|
This makes it easier to unify versioning of git based package downloads.
|
|
PKG_SOURCE_DATE along with an 8-character abbreviation of the git hash
|
|
is used as PKG_VERSION, PKG_RELEASE should be used like normal packages.
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
|
|
diff --git a/include/download.mk b/include/download.mk
|
|
index 2aa75ce2e4f98e850d761b9416963c7958df7c82..b5a2a16a3072a7635b42514a77f2458e34ae1d64 100644
|
|
--- a/include/download.mk
|
|
+++ b/include/download.mk
|
|
@@ -10,6 +10,12 @@ PROJECT_GIT = https://git.openwrt.org
|
|
OPENWRT_GIT = $(PROJECT_GIT)
|
|
LEDE_GIT = $(PROJECT_GIT)
|
|
|
|
+ifdef PKG_SOURCE_VERSION
|
|
+PKG_VERSION ?= $(if $(PKG_SOURCE_DATE),$(PKG_SOURCE_DATE)-)$(call version_abbrev,$(PKG_SOURCE_VERSION))
|
|
+PKG_SOURCE_SUBDIR ?= $(PKG_NAME)-$(PKG_VERSION)
|
|
+PKG_SOURCE ?= $(PKG_SOURCE_SUBDIR).tar.xz
|
|
+endif
|
|
+
|
|
DOWNLOAD_RDEP=$(STAMP_PREPARED) $(HOST_STAMP_PREPARED)
|
|
|
|
# Try to guess the download method from the URL
|
|
diff --git a/include/host-build.mk b/include/host-build.mk
|
|
index 44401b866a4d637648bb093470a5e66b4a3e38fc..6a5f82dd302c948e8d9d53a67dbfb842d171a25d 100644
|
|
--- a/include/host-build.mk
|
|
+++ b/include/host-build.mk
|
|
@@ -5,6 +5,8 @@
|
|
# See /LICENSE for more information.
|
|
#
|
|
|
|
+include $(INCLUDE_DIR)/download.mk
|
|
+
|
|
HOST_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
|
|
HOST_INSTALL_DIR ?= $(HOST_BUILD_DIR)/host-install
|
|
HOST_BUILD_PARALLEL ?=
|
|
@@ -34,7 +36,6 @@ HOST_STAMP_INSTALLED:=$(STAGING_DIR_HOST)/stamp/.$(PKG_NAME)_installed
|
|
|
|
override MAKEFLAGS=
|
|
|
|
-include $(INCLUDE_DIR)/download.mk
|
|
include $(INCLUDE_DIR)/quilt.mk
|
|
include $(INCLUDE_DIR)/autotools.mk
|
|
|
|
diff --git a/include/package.mk b/include/package.mk
|
|
index a99cdc6990280d7ef83223861cd9f224c6eebc33..ed83865b2192e56c41faa8b14f5aad8715d70f04 100644
|
|
--- a/include/package.mk
|
|
+++ b/include/package.mk
|
|
@@ -9,6 +9,8 @@ __package_mk:=1
|
|
|
|
all: $(if $(DUMP),dumpinfo,compile)
|
|
|
|
+include $(INCLUDE_DIR)/download.mk
|
|
+
|
|
PKG_BUILD_DIR ?= $(BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
|
|
PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/ipkg-install
|
|
PKG_MD5SUM ?= unknown
|
|
@@ -129,7 +131,6 @@ endif
|
|
PKG_DIR_NAME:=$(lastword $(subst /,$(space),$(CURDIR)))
|
|
PKG_INSTALL_STAMP:=$(PKG_INFO_DIR)/$(PKG_DIR_NAME).$(if $(BUILD_VARIANT),$(BUILD_VARIANT),default).install
|
|
|
|
-include $(INCLUDE_DIR)/download.mk
|
|
include $(INCLUDE_DIR)/quilt.mk
|
|
include $(INCLUDE_DIR)/package-defaults.mk
|
|
include $(INCLUDE_DIR)/package-dumpinfo.mk
|
|
diff --git a/rules.mk b/rules.mk
|
|
index 3aac5c770056ab1b2e84eb15d3bfdabd546df8a9..da4d48b0e28b2d845323901163b95162cf7e1c03 100644
|
|
--- a/rules.mk
|
|
+++ b/rules.mk
|
|
@@ -49,6 +49,8 @@ __tr_template = $(__tr_head)$$(1)$(__tr_tail)
|
|
$(eval toupper = $(call __tr_template,$(chars_lower),$(chars_upper)))
|
|
$(eval tolower = $(call __tr_template,$(chars_upper),$(chars_lower)))
|
|
|
|
+version_abbrev = $(if $(if $(CHECK),,$(DUMP)),$(1),$(shell printf '%.8s' $(1)))
|
|
+
|
|
_SINGLE=export MAKEFLAGS=$(space);
|
|
CFLAGS:=
|
|
ARCH:=$(subst i486,i386,$(subst i586,i386,$(subst i686,i386,$(call qstrip,$(CONFIG_ARCH)))))
|