aboutsummaryrefslogtreecommitdiffstats
path: root/package/utils/e2fsprogs/patches
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2019-01-14 16:29:18 -0800
committerHauke Mehrtens <hauke@hauke-m.de>2019-01-26 23:11:49 +0100
commit8fd509169644e456f21e0f2a26dbb8745c8fcb6a (patch)
tree780058a50c5443aedf6147f4b90aa102d9072f30 /package/utils/e2fsprogs/patches
parent1c2f7b511514d43d8a826b26e09817b2750a2bf4 (diff)
downloadupstream-8fd509169644e456f21e0f2a26dbb8745c8fcb6a.tar.gz
upstream-8fd509169644e456f21e0f2a26dbb8745c8fcb6a.tar.bz2
upstream-8fd509169644e456f21e0f2a26dbb8745c8fcb6a.zip
e2fsprogs: Update to 1.44.5
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 Some top-level reorganization for consistency between packages. Tested on GnuBee PC1 (mt7621). Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'package/utils/e2fsprogs/patches')
-rw-r--r--package/utils/e2fsprogs/patches/000-relocatable.patch26
1 files changed, 10 insertions, 16 deletions
diff --git a/package/utils/e2fsprogs/patches/000-relocatable.patch b/package/utils/e2fsprogs/patches/000-relocatable.patch
index 017aca1b05..0bf226f9ea 100644
--- a/package/utils/e2fsprogs/patches/000-relocatable.patch
+++ b/package/utils/e2fsprogs/patches/000-relocatable.patch
@@ -1,46 +1,40 @@
--- a/lib/et/compile_et.sh.in
+++ b/lib/et/compile_et.sh.in
-@@ -2,9 +2,15 @@
+@@ -2,8 +2,14 @@
#
#
--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"
++ DIR="$STAGING_DIR/../hostpkg/share/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
+@@ -2,10 +2,16 @@
#
#
--
--datarootdir=@datarootdir@
+
-DIR=@datadir@/ss
-AWK=@AWK@
--SED=@SED@
+ 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"
++ DIR="$STAGING_DIR/../hostpkg/share/ss"
+ AWK=awk
-+ SED=sed
+fi
-
++
for as_var in \
LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \