From 036b499a006bff40fa47d85ebb04dd6cb5ea969b Mon Sep 17 00:00:00 2001 From: Pavel Kopylov Date: Wed, 23 Aug 2023 16:35:27 +0200 Subject: [PATCH] Fix sudo install --- SOURCES/fix-sudo-install.patch | 37 +++++++++++++++++++++++++++++++++ SPECS/raspberrypi-userland.spec | 7 +++++-- 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 SOURCES/fix-sudo-install.patch diff --git a/SOURCES/fix-sudo-install.patch b/SOURCES/fix-sudo-install.patch new file mode 100644 index 0000000..6ef0a69 --- /dev/null +++ b/SOURCES/fix-sudo-install.patch @@ -0,0 +1,37 @@ +From bc464c83e973a4e5c01c41dc4bb7d4714293f511 Mon Sep 17 00:00:00 2001 +From: Pavel Kopylov +Date: Wed, 23 Aug 2023 16:32:41 +0200 +Subject: [PATCH] Fix sudo install + +--- + buildme | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/buildme b/buildme +index 9e2d405..6bc241d 100755 +--- a/buildme ++++ b/buildme +@@ -28,9 +28,9 @@ if [ $ARCH = "armv6l" ] || [ $ARCH = "armv7l" ] || [ $ARCH = "aarch64" ]; then + make -j4 + fi + if [ "$1" != "" ]; then +- sudo make install DESTDIR=$1 ++ make install DESTDIR=$1 + else +- sudo make install ++ make install + fi + elif [ "$1" = "--native" ]; then + # Build natively on the host +@@ -47,7 +47,7 @@ else + make -j `nproc` + + if [ "$1" != "" ]; then +- sudo make install DESTDIR=$1 ++ make install DESTDIR=$1 + fi + fi + popd +-- +2.34.1 + diff --git a/SPECS/raspberrypi-userland.spec b/SPECS/raspberrypi-userland.spec index 6725d96..67b648b 100644 --- a/SPECS/raspberrypi-userland.spec +++ b/SPECS/raspberrypi-userland.spec @@ -18,7 +18,8 @@ ExclusiveArch: aarch64 URL: %{userland_url} Source0: %{userland_url}/archive/%{userland_commit}/userland-%{userland_commit}.tar.gz -Patch0: fix-buildme-arm64.patch +Patch0: fix-sudo-install.patch +Patch1: fix-buildme-arm64.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -47,13 +48,15 @@ This package contains static libraries. %setup -q -n userland-%{userland_commit} -%patch0 -p2 +%patch0 -p1 +%patch1 -p2 %build ./buildme --force-arm64 %{build_dir} %install + mkdir -p %{buildroot}/usr/%{target_lib} mkdir -p %{buildroot}/usr/%{target_lib}/pkgconfig mkdir -p %{buildroot}/usr/bin