e2fsprogs: Update to 1.44.5

[openwrt/staging/wigyori.git] / package / utils / e2fsprogs / patches / 000-relocatable.patch

diff --git a/package/utils/e2fsprogs/patches/000-relocatable.patch b/package/utils/e2fsprogs/patches/000-relocatable.patch
index 017aca1b05121506e740494345755e4897338d8d..0bf226f9ea7039065a62f31a8c1f98ebfd9c0e47 100644 (file)
--- 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 \