[OpenWrt-Devel] e2fsprogs: Update to 1.43.5

Message ID 20190111202612.15508-1-rosenp@gmail.com
State Superseded
Headers show
Series
  • [OpenWrt-Devel] e2fsprogs: Update to 1.43.5
Related show

Commit Message

Rosen Penev Jan. 11, 2019, 8:26 p.m.
Added e4crypt tool for encrypting files and directories. To work properly
requires kernel and work on keyutils. That will be done in a future commit

Remove patch 000-relocatable.patch as it seems to be no longer needed.

Some top-level reorganization for consistency between packages.

Tested on GnuBee PC1 (mt7621).

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 package/utils/e2fsprogs/Makefile              | 18 +++++++-
 .../e2fsprogs/patches/000-relocatable.patch   | 46 -------------------
 2 files changed, 16 insertions(+), 48 deletions(-)
 delete mode 100644 package/utils/e2fsprogs/patches/000-relocatable.patch

Comments

Jo-Philipp Wich Jan. 13, 2019, 11:50 a.m. | #1
Hi,

> Remove patch 000-relocatable.patch as it seems to be no longer needed.

did you verify that the generated compile_et and make_cmds scripts are
installed without absolute paths in the host staging directory?

If not, then removing this path will result in very hard to debug SDK
build failures for packages relying on libcom_err or libss.

~ Jo
Rosen Penev Jan. 14, 2019, 2:36 a.m. | #2
On Sun, Jan 13, 2019 at 3:50 AM Jo-Philipp Wich <jo@mein.io> wrote:
>
> Hi,
>
> > Remove patch 000-relocatable.patch as it seems to be no longer needed.
>
> did you verify that the generated compile_et and make_cmds scripts are
> installed without absolute paths in the host staging directory?
This is what I got for the former:

mangix@mangix-pc:~/devstuff/openwrt/staging_dir$ find | grep compile_et
./hostpkg/bin/compile_et
./host/share/man/man1/compile_et.1
./host/bin/compile_et

none are symlinks.

The datarootdir variable got removed, which is most of the patch.
>
> If not, then removing this path will result in very hard to debug SDK
> build failures for packages relying on libcom_err or libss.
>
> ~ Jo
>
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Jo-Philipp Wich Jan. 14, 2019, 1:02 p.m. | #3
Hi,

its not about symlinks, its about the paths embedded in these generated
scripts.

~ Jo

Patch

diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile
index 48f812a30c..edb9acfc76 100644
--- a/package/utils/e2fsprogs/Makefile
+++ b/package/utils/e2fsprogs/Makefile
@@ -8,13 +8,15 @@ 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=e2fsprogs
-PKG_VERSION:=1.44.3
-PKG_HASH:=5d899f7d30f481cc0c6a049ebe26ebe145f1b524182ea1ecde4086162d4e4bb6
+PKG_VERSION:=1.44.5
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/
+PKG_HASH:=ba5eb3069d69160d96818bb9700de9ab5a8458d9add1fd85d427c0000d34c5b9
+
 PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=NOTICE
 PKG_CPE_ID:=cpe:/a:e2fsprogs_project:e2fsprogs
 
 PKG_BUILD_DEPENDS:=util-linux e2fsprogs/host
@@ -107,6 +109,12 @@  $(call Package/e2fsprogs)
   DEPENDS:= +e2fsprogs
 endef
 
+define Package/e4crypt
+$(call Package/e2fsprogs)
+  TITLE:=Ext4 Filesystem encryption utility
+  DEPENDS:= +e2fsprogs
+endef
+
 define Package/filefrag
 $(call Package/e2fsprogs)
   TITLE:=Ext2 Filesystem file fragmentation report utility
@@ -278,6 +286,11 @@  define Package/e2freefrag/install
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/e2freefrag $(1)/usr/sbin/
 endef
 
+define Package/e4crypt/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/e4crypt $(1)/usr/sbin/
+endef
+
 define Package/filefrag/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/filefrag $(1)/usr/sbin/
@@ -308,6 +321,7 @@  $(eval $(call BuildPackage,resize2fs))
 $(eval $(call BuildPackage,badblocks))
 $(eval $(call BuildPackage,dumpe2fs))
 $(eval $(call BuildPackage,e2freefrag))
+$(eval $(call BuildPackage,e4crypt))
 $(eval $(call BuildPackage,filefrag))
 $(eval $(call BuildPackage,debugfs))
 $(eval $(call BuildPackage,chattr))
diff --git a/package/utils/e2fsprogs/patches/000-relocatable.patch b/package/utils/e2fsprogs/patches/000-relocatable.patch
deleted file mode 100644
index 017aca1b05..0000000000
--- a/package/utils/e2fsprogs/patches/000-relocatable.patch
+++ /dev/null
@@ -1,46 +0,0 @@ 
---- a/lib/et/compile_et.sh.in
-+++ b/lib/et/compile_et.sh.in
-@@ -2,9 +2,15 @@
- #
- #
- 
--datarootdir=@datarootdir@
--AWK=@AWK@
--DIR=@datadir@/et
-+if test "x$STAGING_DIR" = x ; then
-+	datarootdir=@datarootdir@
-+	AWK=@AWK@
-+	DIR=@datadir@/et
-+else
-+	datarootdir="$STAGING_DIR/../hostpkg/share"
-+	AWK=awk
-+	DIR="$datarootdir/et"
-+fi
- 
- if test "$1" = "--build-tree" ; then
-     shift;
---- a/lib/ss/mk_cmds.sh.in
-+++ b/lib/ss/mk_cmds.sh.in
-@@ -1,11 +1,17 @@
- #!/bin/sh
- #
- #
--
--datarootdir=@datarootdir@
--DIR=@datadir@/ss
--AWK=@AWK@
--SED=@SED@
-+if test "x$STAGING_DIR" = x ; then
-+	datarootdir=@datarootdir@
-+	DIR=@datadir@/ss
-+	AWK=@AWK@
-+	SED=@SED@
-+else
-+	datarootdir="$STAGING_DIR/../hostpkg/share"
-+	DIR="$datarootdir/ss"
-+	AWK=awk
-+	SED=sed
-+fi
- 
- for as_var in \
-   LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \