pool/catatonit
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 594071 from home:cyphar:containers:catatonit

Browse Source 
- Fix build to correctly build a static binary (which will allow it to work in
  all containers). This was caused by forgetting to include
  'glibc-devel-static'. I've added a check to ensure it doesn't happen by
  accident again.

OBS-URL: https://build.opensuse.org/request/show/594071
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/catatonit?expand=0&rev=6
This commit is contained in:
Aleksa Sarai 2018-04-06 18:38:34 +00:00 committed by Git OBS Bridge
parent fc89319be7
commit 83a8c21966
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
catatonit-rpmlintrc Normal file
View File

@ -0,0 +1,3 @@
# We need catatonit to be statically linked.
addFilter ("^catatonit.*: W: statically-linked-binary /usr/bin/catatonit")
addFilter ("^catatonit.*: W: position-independent-executable-suggested /usr/bin/catatonit")

8
catatonit.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Apr 6 18:31:08 UTC 2018 - asarai@suse.com
- Fix build to correctly build a static binary (which will allow it to work in
all containers). This was caused by forgetting to include
'glibc-devel-static'. I've added a check to ensure it doesn't happen by
accident again.
-------------------------------------------------------------------
Tue Apr 3 23:27:27 UTC 2018 - jengelh@inai.de

6
catatonit.spec
View File

@ -28,7 +28,9 @@ Source1: %{name}-%{version}.tar.xz.asc
Source2: %{name}.keyring
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: file
BuildRequires: gcc
BuildRequires: glibc-devel-static
BuildRequires: libtool
%description
@ -49,6 +51,10 @@ autoreconf -fi
%configure
make %{?_smp_mflags}
# Make sure we *always* build a static binary. Otherwise we'll break containers
# that don't have the necessary shared libs.
file ./%{name} | grep 'statically linked'
%install
%make_install
ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/docker-init