rpm/busybox
SHA256
1
0
Fork 0
forked from pool/busybox
Code Pull Requests Activity

Accepting request 1035770 from home:radolin:branches:Base:System

Browse Source 
- Fix build under SLE12

OBS-URL: https://build.opensuse.org/request/show/1035770
OBS-URL: https://build.opensuse.org/package/show/Base:System/busybox?expand=0&rev=112
This commit is contained in:
Radoslav Kolev 2022-11-15 09:31:32 +00:00 committed by Git OBS Bridge
parent 70c69d8726
commit cdd3182bee
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
busybox.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Nov 14 08:52:35 UTC 2022 - Radoslav Kolev <radoslav.kolev@suse.com>
- Fix build under SLE-12
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 17 17:26:27 UTC 2022 - Radoslav Kolev <radoslav.kolev@suse.com> Mon Oct 17 17:26:27 UTC 2022 - Radoslav Kolev <radoslav.kolev@suse.com>

7
busybox.spec
View File

@ -46,7 +46,12 @@ Patch2: testsuite-gnu-echo.patch
Patch100: busybox.install.patch Patch100: busybox.install.patch
Provides: useradd_or_adduser_dep Provides: useradd_or_adduser_dep
BuildRequires: glibc-devel-static BuildRequires: glibc-devel-static
#in SLE12 hostname is part of the net-tools package
%if %{?suse_version} && %{?suse_version} <= 1315
BuildRequires: net-tools
%else
BuildRequires: hostname BuildRequires: hostname
%endif
BuildRequires: pkgconfig(libselinux) BuildRequires: pkgconfig(libselinux)
# for test suite # for test suite
BuildRequires: zip BuildRequires: zip
@ -92,7 +97,9 @@ cd /usr/share/busybox/testsuite
PATH=/usr/share/busybox:$PATH SKIP_KNOWN_BUGS=1 ./runtest PATH=/usr/share/busybox:$PATH SKIP_KNOWN_BUGS=1 ./runtest
%prep %prep
#SLE12 needs an empty line after autosetup for it to expand properly (bsc#1205420)
%autosetup -p1 %autosetup -p1
find "(" -name CVS -o -name .cvsignore -o -name .svn -o -name .gitignore ")" \ find "(" -name CVS -o -name .cvsignore -o -name .svn -o -name .gitignore ")" \
-exec rm -Rf {} + -exec rm -Rf {} +