2021-02-21 14:42:43 +01:00
|
|
|
From fc0e20e4d4a43c86f9151f74164983bbe7a3a9c7 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Andreas Stieger <astieger@suse.com>
|
|
|
|
|
Date: Sun, 25 Jan 2015 00:23:57 +0100
|
|
|
|
|
Subject: [PATCH] remove Debian specific command
|
|
|
|
|
|
|
|
|
|
Remove Debian specific architecture detection and replace with build time setting.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Stewart Smith <stewart@flamingspork.com>
|
|
|
|
|
---
|
|
|
|
|
eatmydata.in | 4 +---
|
|
|
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git eatmydata.in eatmydata.in
|
|
|
|
|
index 40468db..e37f07c 100644
|
srcpkgs/l*: convert patches to -Np1
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
2021-06-19 05:03:21 +02:00
|
|
|
--- a/eatmydata.in
|
|
|
|
|
+++ b/eatmydata.in
|
2021-02-21 14:42:43 +01:00
|
|
|
@@ -15,9 +15,7 @@
|
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
-export `dpkg-architecture|grep DEB_BUILD_MULTIARCH`
|
|
|
|
|
-
|
|
|
|
|
-shlib="/usr/lib/$DEB_BUILD_MULTIARCH/eatmydata.sh"
|
|
|
|
|
+shlib="@libexecdir@/eatmydata.sh"
|
|
|
|
|
if [ -f "$shlib" ]; then
|
|
|
|
|
. "$shlib"
|
|
|
|
|
else
|
