Fix some minor install directory path issues
Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
parent
2d40f773c6
commit
c555f75234
36
0004-Honor-sbindir.patch
Normal file
36
0004-Honor-sbindir.patch
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
From a56df998177574ef2db332220c15f11bccd98f7e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Wed, 18 Jul 2018 13:41:02 -0400
|
||||||
|
Subject: [PATCH] Honor sbindir
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
Makefile | 8 ++++----
|
||||||
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index ac144046133..2b18dd6404b 100644
|
||||||
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
|
@@ -42,14 +42,14 @@ test: all
|
||||||
|
@./test.sh
|
||||||
|
|
||||||
|
install: all
|
||||||
|
- mkdir -p $(DESTDIR)$(PREFIX)/sbin
|
||||||
|
+ mkdir -p $(DESTDIR)$(PREFIX)$(sbindir)
|
||||||
|
mkdir -p $(DESTDIR)/$(mandir)/man8
|
||||||
|
- install -m 755 new-kernel-pkg $(DESTDIR)$(PREFIX)/sbin
|
||||||
|
+ install -m 755 new-kernel-pkg $(DESTDIR)$(PREFIX)$(sbindir)
|
||||||
|
install -m 644 new-kernel-pkg.8 $(DESTDIR)/$(mandir)/man8
|
||||||
|
- install -m 755 installkernel $(DESTDIR)$(PREFIX)/sbin
|
||||||
|
+ install -m 755 installkernel $(DESTDIR)$(PREFIX)$(sbindir)
|
||||||
|
install -m 644 installkernel.8 $(DESTDIR)/$(mandir)/man8
|
||||||
|
if [ -f grubby ]; then \
|
||||||
|
- install -m 755 grubby $(DESTDIR)$(PREFIX)/sbin ; \
|
||||||
|
+ install -m 755 grubby $(DESTDIR)$(PREFIX)$(sbindir) ; \
|
||||||
|
install -m 644 grubby.8 $(DESTDIR)/$(mandir)/man8 ; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
--
|
||||||
|
2.17.1
|
||||||
|
|
15
grubby.spec
15
grubby.spec
@ -15,6 +15,7 @@ Patch1: drop-uboot-uImage-creation.patch
|
|||||||
Patch2: 0001-Change-return-type-in-getRootSpecifier.patch
|
Patch2: 0001-Change-return-type-in-getRootSpecifier.patch
|
||||||
Patch3: 0002-Add-btrfs-subvolume-support-for-grub2.patch
|
Patch3: 0002-Add-btrfs-subvolume-support-for-grub2.patch
|
||||||
Patch4: 0003-Add-tests-for-btrfs-support.patch
|
Patch4: 0003-Add-tests-for-btrfs-support.patch
|
||||||
|
Patch5: 0004-Honor-sbindir.patch
|
||||||
|
|
||||||
BuildRequires: pkgconfig glib2-devel popt-devel
|
BuildRequires: pkgconfig glib2-devel popt-devel
|
||||||
BuildRequires: libblkid-devel git-core sed
|
BuildRequires: libblkid-devel git-core sed
|
||||||
@ -59,10 +60,10 @@ make test
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
|
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} sbindir=%{_sbindir}
|
||||||
|
|
||||||
mkdir -p %{buildroot}%{_libexecdir}/grubby/
|
mkdir -p %{buildroot}%{_libexecdir}/grubby/ %{buildroot}%{_sbindir}/
|
||||||
mv -v %{buildroot}/sbin/grubby %{buildroot}%{_libexecdir}/grubby/grubby
|
mv -v %{buildroot}%{_sbindir}/grubby %{buildroot}%{_libexecdir}/grubby/grubby
|
||||||
cp -v %{SOURCE1} %{buildroot}%{_libexecdir}/grubby/
|
cp -v %{SOURCE1} %{buildroot}%{_libexecdir}/grubby/
|
||||||
sed -e "s,@@LIBEXECDIR@@,%{_libexecdir},g" %{SOURCE2} \
|
sed -e "s,@@LIBEXECDIR@@,%{_libexecdir},g" %{SOURCE2} \
|
||||||
> %{buildroot}%{_sbindir}/grubby
|
> %{buildroot}%{_sbindir}/grubby
|
||||||
@ -81,9 +82,9 @@ meant to only be used for legacy compatibility users with existing grubby users.
|
|||||||
%license COPYING
|
%license COPYING
|
||||||
%dir %{_libexecdir}/grubby
|
%dir %{_libexecdir}/grubby
|
||||||
%{_libexecdir}/grubby/grubby
|
%{_libexecdir}/grubby/grubby
|
||||||
/sbin/grubby
|
%{_sbindir}/grubby
|
||||||
/sbin/installkernel
|
%{_sbindir}/installkernel
|
||||||
/sbin/new-kernel-pkg
|
%{_sbindir}/new-kernel-pkg
|
||||||
%{_mandir}/man8/*.8*
|
%{_mandir}/man8/*.8*
|
||||||
|
|
||||||
%files bls
|
%files bls
|
||||||
@ -91,7 +92,7 @@ meant to only be used for legacy compatibility users with existing grubby users.
|
|||||||
%license COPYING
|
%license COPYING
|
||||||
%dir %{_libexecdir}/grubby
|
%dir %{_libexecdir}/grubby
|
||||||
%{_libexecdir}/grubby/grubby-bls
|
%{_libexecdir}/grubby/grubby-bls
|
||||||
/sbin/grubby
|
%{_sbindir}/grubby
|
||||||
%{_mandir}/man8/*.8*
|
%{_mandir}/man8/*.8*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
Reference in New Issue
Block a user