fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
master
immortalwrt/tools/e2fsprogs/Makefile

56 lines
1.4 KiB
Makefile
Raw Permalink Normal View History

add e2fsprogs to tools and use that instead of libuuid SVN-Revision: 24078
2010-11-22 19:26:45 +08:00
#
tools/e2fsprogs: update to 1.42.13 Update e2fsprogs to 1.42.13. Refresh and cleanup patches. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi> SVN-Revision: 47426
2015-11-09 04:40:03 +08:00
# Copyright (C) 2010-2015 OpenWrt.org
add e2fsprogs to tools and use that instead of libuuid SVN-Revision: 24078
2010-11-22 19:26:45 +08:00
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=e2fsprogs
add PKG_CPE_ID ids to package and tools CPE ids helps to tracks CVE in packages. https://cpe.mitre.org/specification/ Thanks to swalker for CPE to package mapping and keep tracking CVEs. Acked-by: Jo-Philipp Wich <jo@mein.io> Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
2017-09-28 10:55:46 +08:00
PKG_CPE_ID:=cpe:/a:e2fsprogs_project:e2fsprogs
tools/e2fsprogs: update to 1.47.0 Release notes: https://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.47.0 Signed-off-by: Nick Hainke <vincent@systemli.org>
2023-02-11 22:22:41 +08:00
PKG_VERSION:=1.47.0
tools: prefer gz or bz2 tarballs In the light of recent XZ events, and fundamental XZ issues lets work on moving away from using XZ. So, use gz compressed tarballs as sources whenever possible. dwarves only offers bz2 compressed tarballs, so use those as size difference is minor compared to XZ. Signed-off-by: Robert Marko <robimarko@gmail.com> dwarves
2024-04-04 01:12:57 +08:00
PKG_HASH:=0b4fe723d779b0927fb83c9ae709bc7b40f66d7df36433bef143e41c54257084
add e2fsprogs to tools and use that instead of libuuid SVN-Revision: 24078
2010-11-22 19:26:45 +08:00
tools: prefer gz or bz2 tarballs In the light of recent XZ events, and fundamental XZ issues lets work on moving away from using XZ. So, use gz compressed tarballs as sources whenever possible. dwarves only offers bz2 compressed tarballs, so use those as size difference is minor compared to XZ. Signed-off-by: Robert Marko <robimarko@gmail.com> dwarves
2024-04-04 01:12:57 +08:00
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
tools/e2fsprogs: Update to 1.43.4 * Update to 1.43.4 * Refresh patches * xz tarball which saves about 2M in size Changelog: http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.43.4 Tested by Etienne Haarsma (ar71xx), Daniel Engberg (kirkwood) Signed-off-by: Etienne Haarsma <bladeoner112@gmail.com> Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net> Signed-off-by: Felix Fietkau <nbd@nbd.name> [use @KERNEL instead of harcoded URL]
2017-02-07 03:05:36 +08:00
PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/
add e2fsprogs to tools and use that instead of libuuid SVN-Revision: 24078
2010-11-22 19:26:45 +08:00
tools/e2fsprogs: enable parallel builds SVN-Revision: 33440
2012-09-15 22:18:07 +08:00
HOST_BUILD_PARALLEL:=1
add e2fsprogs to tools and use that instead of libuuid SVN-Revision: 24078
2010-11-22 19:26:45 +08:00
include $(INCLUDE_DIR)/host-build.mk
tools/e2fsprogs: fix build with clang Signed-off-by: Felix Fietkau <nbd@nbd.name>
2018-09-15 21:49:31 +08:00
ifneq ($(shell $(HOSTCC) --version | grep clang),)
tools/e2fsprogs: fix build under macos macos doesn't define a loff_t type, the native off_t type being 64bit anyway. Persuade e2fsprogs to accept off_t instead on macos Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2020-04-10 18:37:26 +08:00
HOST_CFLAGS += -D__GNUC_PREREQ\(...\)=0 -Dloff_t=off_t
tools/e2fsprogs: fix build with clang Signed-off-by: Felix Fietkau <nbd@nbd.name>
2018-09-15 21:49:31 +08:00
endif
tools/e2fsprogs: update to 1.46.2 Fix wrong FPIC flag to fix compilation under sparc64 Signed-off-by: Rosen Penev <rosenp@gmail.com>
2021-06-20 06:11:23 +08:00
HOST_CFLAGS += $(HOST_FPIC)
add e2fsprogs to tools and use that instead of libuuid SVN-Revision: 24078
2010-11-22 19:26:45 +08:00
more e2fsprogs fixes SVN-Revision: 32158
2012-06-10 17:22:07 +08:00
HOST_CONFIGURE_ARGS += \
tools/e2fsprogs: disable building elf shared libraries, it is unnecessary and breaks on mac os x SVN-Revision: 32161
2012-06-10 20:24:59 +08:00
--disable-elf-shlibs \
tools: e2fsprogs: use libuuid provided by util-linux We are now using util-linux to provide libuuid so disable building it in e2fsprogs and simply use the util-linux provided one. Disabling libuuid removes the need for custom install recipe. Link: https://github.com/openwrt/openwrt/pull/15806 Signed-off-by: Robert Marko <robimarko@gmail.com>
2024-06-26 01:43:30 +08:00
--disable-libuuid \
fix build breakage introduced by [32142] SVN-Revision: 32157
2012-06-10 15:43:43 +08:00
--disable-tls \
tools/e2fsprogs: Update to 1.45.5 Update e2fsprogs to 1.45.5 Enable pthreads support Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2020-02-03 21:21:56 +08:00
--disable-nls \
tools/e2fsprogs: disable building fuse2fs to avoid depending on libfuse Signed-off-by: Felix Fietkau <nbd@nbd.name>
2024-03-24 17:40:31 +08:00
--enable-threads=pth \
tools: e2fsprogs: pass --with-crond-dir=no instead of patching Currently, e2fsprogs is being patched to avoid detecting host crond, but instead of doing that we can simply pass --with-crond-dir=no as an argument and drop the patch. Link: https://github.com/openwrt/openwrt/pull/16500 Signed-off-by: Robert Marko <robimarko@gmail.com>
2024-09-25 19:31:29 +08:00
--disable-fuse2fs \
--with-crond-dir=no
add e2fsprogs to tools and use that instead of libuuid SVN-Revision: 24078
2010-11-22 19:26:45 +08:00
tools: e2fsprogs: bypass libuuid check The check is the wrong way around. It uses AC_CHECK_LIBS and then pkg-config, probably because the latter is a second class citizen. Just bypass it. pkg-config gets used anyway. Signed-off-by: Rosen Penev <rosenp@gmail.com> Link: https://github.com/openwrt/openwrt/pull/16480 Link: https://github.com/openwrt/openwrt/pull/16480 Link: https://github.com/openwrt/openwrt/pull/16480 Signed-off-by: Robert Marko <robimarko@gmail.com>
2024-09-26 01:42:15 +08:00
# The following uses pkg-config the wrong way around. Just override it.
HOST_CONFIGURE_VARS += \
ac_cv_lib_uuid_uuid_generate=yes
tools: e2fsprogs: delete doc/ directory after unpacking to ensure that makeinfo is not invoked SVN-Revision: 34459
2012-12-03 02:35:39 +08:00
define Host/Prepare
$(call Host/Prepare/Default)
rm -rf $(HOST_BUILD_DIR)/doc
endef
tools/e2fsprogs: fix shell scripts under SDK 7c32295b0036be425ba0cd527eb06316a87d0ec0 exposed a problem where the SDK builds these shell scripts with a nonsensical absolute path for the DIR variable. Use sed to patch in $STAGING_DIR_HOST. Also remove PKG_RELEASE as that is nonsensical for tools. Signed-off-by: Rosen Penev <rosenp@gmail.com> Link: https://github.com/openwrt/openwrt/pull/15841 Signed-off-by: Robert Marko <robimarko@gmail.com>
2024-07-01 00:08:40 +08:00
define Host/Install
$(call Host/Install/Default)
tools/e2fsprogs: fixup STAGING_DIR_HOST path evaluation in shell scripts We have to use curly braces on the exported STAGING_DIR_HOST env variable, instead of evaluating it directly as we are not in Make but a separate shell script. Otherwise it would fail with: staging_dir/host/bin/compile_et: line 6: STAGING_DIR_HOST: command not found staging_dir/host/bin/mk_cmds: line 5: STAGING_DIR_HOST: command not found And so when krb5 tries to build it will fail as compile_et and mk_cmds will return an error. Fixes: 55bda9863dd0 ("tools/e2fsprogs: fix shell scripts under SDK") Link: https://github.com/openwrt/openwrt/pull/15854 Signed-off-by: Robert Marko <robimarko@gmail.com>
2024-07-02 17:14:17 +08:00
$(SED) 's|^DIR=.*|DIR=$$$${STAGING_DIR_HOST}/share/et|' $(STAGING_DIR_HOST)/bin/compile_et
$(SED) 's|^DIR=.*|DIR=$$$${STAGING_DIR_HOST}/share/ss|' $(STAGING_DIR_HOST)/bin/mk_cmds
tools/e2fsprogs: fix shell scripts under SDK 7c32295b0036be425ba0cd527eb06316a87d0ec0 exposed a problem where the SDK builds these shell scripts with a nonsensical absolute path for the DIR variable. Use sed to patch in $STAGING_DIR_HOST. Also remove PKG_RELEASE as that is nonsensical for tools. Signed-off-by: Rosen Penev <rosenp@gmail.com> Link: https://github.com/openwrt/openwrt/pull/15841 Signed-off-by: Robert Marko <robimarko@gmail.com>
2024-07-01 00:08:40 +08:00
endef
tools: e2fsprogs: use standard make uninstall There is no need to manually only remove 2 binaries during cleanup and leave rest of the e2fsprogs installed stuff untouched, so instead use make uninstall to do the cleanup. Link: https://github.com/openwrt/openwrt/pull/15806 Signed-off-by: Robert Marko <robimarko@gmail.com>
2024-06-26 01:45:12 +08:00
define Host/Uninstall
-$(call Host/Compile/Default,uninstall)
add e2fsprogs to tools and use that instead of libuuid SVN-Revision: 24078
2010-11-22 19:26:45 +08:00
endef
$(eval $(call HostBuild))
Reference in New Issue Copy Permalink