-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
catatonit is a simple but valid init binary to act as PID 1 for containers. https://github.com/openSUSE/catatonit Dependency of podman. Signed-off-by: Christian Stewart <[email protected]> Signed-off-by: Thomas Petazzoni <[email protected]>
- Loading branch information
1 parent
8369ff6
commit e3975ec
Showing
6 changed files
with
68 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -533,6 +533,7 @@ F: package/python-pylibftdi/ | |
|
||
N: Christian Stewart <[email protected]> | ||
F: package/batman-adv/ | ||
F: package/catatonit/ | ||
F: package/containerd/ | ||
F: package/crun/ | ||
F: package/delve/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
package/catatonit/0001-configure.ac-call-AM_INIT_AUTOMAKE-only-once.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
From 99bb9048f532257f3a2c3856cfa19fe957ab6cec Mon Sep 17 00:00:00 2001 | ||
From: Antonio Terceiro <[email protected]> | ||
Date: Thu, 4 Nov 2021 07:37:13 -0300 | ||
Subject: [PATCH] configure.ac: call AM_INIT_AUTOMAKE only once | ||
|
||
That second call seems to be there since the beginning, and autoconf | ||
2.69 was fine with it. autoconf 2.71 doesn't allow it anymore: | ||
|
||
$ ./autogen.sh | ||
autoreconf: export WARNINGS= | ||
autoreconf: Entering directory '.' | ||
autoreconf: configure.ac: not using Gettext | ||
autoreconf: running: aclocal --force | ||
configure.ac:34: error: AM_INIT_AUTOMAKE expanded multiple times | ||
/usr/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... | ||
configure.ac:19: the top level | ||
/usr/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... | ||
configure.ac:34: the top level | ||
autom4te: error: /usr/bin/m4 failed with exit status: 1 | ||
aclocal: error: /usr/bin/autom4te failed with exit status: 1 | ||
autoreconf: error: aclocal failed with exit status: 1 | ||
|
||
Signed-off-by: Antonio Terceiro <[email protected]> | ||
Upstream: https://github.com/openSUSE/catatonit/commit/99bb9048f532257f3a2c3856cfa19fe957ab6cec | ||
Signed-off-by: Christian Stewart <[email protected]> | ||
--- | ||
configure.ac | 1 - | ||
1 file changed, 1 deletion(-) | ||
|
||
diff --git a/configure.ac b/configure.ac | ||
index 12c9186..94c5c84 100644 | ||
--- a/configure.ac | ||
+++ b/configure.ac | ||
@@ -31,4 +31,3 @@ AC_FUNC_FORK | ||
|
||
AC_CONFIG_FILES([Makefile config.h]) | ||
AC_OUTPUT | ||
-AM_INIT_AUTOMAKE | ||
-- | ||
2.37.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
config BR2_PACKAGE_CATATONIT | ||
bool "catatonit" | ||
depends on BR2_USE_MMU | ||
help | ||
catatonit is a simple but valid init binary to act as | ||
PID 1 for containers. | ||
|
||
https://github.com/openSUSE/catatonit |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# Locally computed | ||
sha256 e22bc72ebc23762dad8f5d2ed9d5ab1aaad567bdd54422f1d1da775277a93296 catatonit-0.1.7.tar.gz | ||
sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
################################################################################ | ||
# | ||
# catatonit | ||
# | ||
################################################################################ | ||
|
||
CATATONIT_VERSION = 0.1.7 | ||
CATATONIT_SITE = $(call github,openSUSE,catatonit,v$(CATATONIT_VERSION)) | ||
CATATONIT_LICENSE = GPL-3.0+ | ||
CATATONIT_LICENSE_FILES = COPYING | ||
|
||
CATATONIT_AUTORECONF = YES | ||
|
||
$(eval $(autotools-package)) |