forked from rpms/raspberrypi-userland
Fix sudo install
This commit is contained in:
parent
7c42d174e5
commit
036b499a00
37
SOURCES/fix-sudo-install.patch
Normal file
37
SOURCES/fix-sudo-install.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
From bc464c83e973a4e5c01c41dc4bb7d4714293f511 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Pavel Kopylov <pkopylov@cloudlinux.com>
|
||||||
|
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
|
||||||
|
|
@ -18,7 +18,8 @@ ExclusiveArch: aarch64
|
|||||||
URL: %{userland_url}
|
URL: %{userland_url}
|
||||||
Source0: %{userland_url}/archive/%{userland_commit}/userland-%{userland_commit}.tar.gz
|
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
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
@ -47,13 +48,15 @@ This package contains static libraries.
|
|||||||
|
|
||||||
%setup -q -n userland-%{userland_commit}
|
%setup -q -n userland-%{userland_commit}
|
||||||
|
|
||||||
%patch0 -p2
|
%patch0 -p1
|
||||||
|
%patch1 -p2
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
./buildme --force-arm64 %{build_dir}
|
./buildme --force-arm64 %{build_dir}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
|
||||||
mkdir -p %{buildroot}/usr/%{target_lib}
|
mkdir -p %{buildroot}/usr/%{target_lib}
|
||||||
mkdir -p %{buildroot}/usr/%{target_lib}/pkgconfig
|
mkdir -p %{buildroot}/usr/%{target_lib}/pkgconfig
|
||||||
mkdir -p %{buildroot}/usr/bin
|
mkdir -p %{buildroot}/usr/bin
|
||||||
|
Loading…
Reference in New Issue
Block a user