You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
82 lines
2.6 KiB
82 lines
2.6 KiB
11 years ago
|
From 80dbe6dfbdb2cd3475006e210fe057dceb81ddf2 Mon Sep 17 00:00:00 2001
|
||
|
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
|
||
|
Date: Wed, 2 Oct 2013 22:40:43 +0200
|
||
|
Subject: [PATCH 5/5] Install dracut-install into libexec dir instead of lib
|
||
|
dir
|
||
|
|
||
|
dracut-install script is the only thing ABI specific atm.
|
||
|
|
||
|
See https://bugs.gentoo.org/show_bug.cgi?id=485218 for details on the
|
||
|
problem.
|
||
|
---
|
||
|
Makefile | 4 +++-
|
||
|
configure | 1 +
|
||
|
dracut-functions.sh | 4 ++++
|
||
|
dracut.sh | 1 +
|
||
|
4 files changed, 9 insertions(+), 1 deletion(-)
|
||
|
|
||
|
diff --git a/Makefile b/Makefile
|
||
|
index ea504f5..e004a79 100644
|
||
|
--- a/Makefile
|
||
|
+++ b/Makefile
|
||
|
@@ -92,6 +92,7 @@ install: dracut-version.sh
|
||
|
mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8
|
||
|
install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut
|
||
|
sed -r \
|
||
|
+ -e "s|^(libexecdir)=.*|\1=$(libexecdir)|" \
|
||
|
-e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \
|
||
|
-i $(DESTDIR)$(bindir)/dracut
|
||
|
install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages
|
||
|
@@ -135,7 +136,8 @@ endif
|
||
|
done \
|
||
|
fi
|
||
|
if [ -f install/dracut-install ]; then \
|
||
|
- install -m 0755 install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \
|
||
|
+ mkdir -p $(DESTDIR)$(libexecdir); \
|
||
|
+ install -m 0755 install/dracut-install $(DESTDIR)$(libexecdir)/dracut-install; \
|
||
|
fi
|
||
|
mkdir -p $(DESTDIR)${prefix}/lib/kernel/install.d
|
||
|
install -m 0755 50-dracut.install $(DESTDIR)${prefix}/lib/kernel/install.d/50-dracut.install
|
||
|
diff --git a/configure b/configure
|
||
|
index 19b5e1f..d2ffc2c 100755
|
||
|
--- a/configure
|
||
|
+++ b/configure
|
||
|
@@ -61,6 +61,7 @@ sbindir ?= ${sbindir:-${prefix}/sbin}
|
||
|
mandir ?= ${mandir:-${prefix}/share/man}
|
||
|
enable_documentation ?= ${enable_documentation:-yes}
|
||
|
bindir ?= ${bindir:-${prefix}/bin}
|
||
|
+libexecdir ?= ${libexecdir:-${prefix}/libexec}
|
||
|
EOF
|
||
|
|
||
|
{
|
||
|
diff --git a/dracut-functions.sh b/dracut-functions.sh
|
||
|
index c1cbdeb..72b7f1b 100755
|
||
|
--- a/dracut-functions.sh
|
||
|
+++ b/dracut-functions.sh
|
||
|
@@ -694,6 +694,10 @@ if ! [[ $DRACUT_INSTALL ]]; then
|
||
|
DRACUT_INSTALL=$(find_binary dracut-install)
|
||
|
fi
|
||
|
|
||
|
+if ! [[ $DRACUT_INSTALL ]] && [[ -x $libexecdir/dracut-install ]]; then
|
||
|
+ DRACUT_INSTALL=$libexecdir/dracut-install
|
||
|
+fi
|
||
|
+
|
||
|
if ! [[ $DRACUT_INSTALL ]] && [[ -x $dracutbasedir/dracut-install ]]; then
|
||
|
DRACUT_INSTALL=$dracutbasedir/dracut-install
|
||
|
fi
|
||
|
diff --git a/dracut.sh b/dracut.sh
|
||
|
index cf18c81..e28b929 100755
|
||
|
--- a/dracut.sh
|
||
|
+++ b/dracut.sh
|
||
|
@@ -27,6 +27,7 @@
|
||
|
dracut_args=( "$@" )
|
||
|
|
||
|
# base dirs
|
||
|
+libexecdir=/usr/libexec
|
||
|
pkglibdir=/usr/lib/dracut
|
||
|
dracutbasedir="$pkglibdir"
|
||
|
|
||
|
--
|
||
|
1.8.3.2
|
||
|
|