[Buildroot] [PATCH v1 1/1] package/catatonit: new package

* [Buildroot] [PATCH v1 1/1] package/catatonit: new package
@ 2022-08-21  4:14 Christian Stewart via buildroot
  2022-10-31 10:37 ` Thomas Petazzoni via buildroot
  0 siblings, 1 reply; 2+ messages in thread
From: Christian Stewart via buildroot @ 2022-08-21  4:14 UTC (permalink / raw)
  To: buildroot; +Cc: Christian Stewart, Yann E . MORIN, Thomas Petazzoni

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 <christian@paral.in>
---
 DEVELOPERS                                    |  1 +
 package/Config.in                             |  1 +
 ...e.ac-call-AM_INIT_AUTOMAKE-only-once.patch | 39 +++++++++++++++++++
 package/catatonit/Config.in                   |  7 ++++
 package/catatonit/catatonit.hash              |  3 ++
 package/catatonit/catatonit.mk                | 14 +++++++
 6 files changed, 65 insertions(+)
 create mode 100644 package/catatonit/0001-configure.ac-call-AM_INIT_AUTOMAKE-only-once.patch
 create mode 100644 package/catatonit/Config.in
 create mode 100644 package/catatonit/catatonit.hash
 create mode 100644 package/catatonit/catatonit.mk

diff --git a/DEVELOPERS b/DEVELOPERS
index d2bd0d809a..758219913f 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -529,6 +529,7 @@ F:	package/python-pylibftdi/
 
 N:	Christian Stewart <christian@paral.in>
 F:	package/batman-adv/
+F:	package/catatonit/
 F:	package/containerd/
 F:	package/delve/
 F:	package/docker-cli/
diff --git a/package/Config.in b/package/Config.in
index d1c098c48f..328468d7c4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2520,6 +2520,7 @@ comment "Utilities"
 	source "package/apg/Config.in"
 	source "package/at/Config.in"
 	source "package/bash-completion/Config.in"
+	source "package/catatonit/Config.in"
 	source "package/ccrypt/Config.in"
 	source "package/crudini/Config.in"
 	source "package/dialog/Config.in"
diff --git a/package/catatonit/0001-configure.ac-call-AM_INIT_AUTOMAKE-only-once.patch b/package/catatonit/0001-configure.ac-call-AM_INIT_AUTOMAKE-only-once.patch
new file mode 100644
index 0000000000..bb500df6c7
--- /dev/null
+++ b/package/catatonit/0001-configure.ac-call-AM_INIT_AUTOMAKE-only-once.patch
@@ -0,0 +1,39 @@
+From 99bb9048f532257f3a2c3856cfa19fe957ab6cec Mon Sep 17 00:00:00 2001
+From: Antonio Terceiro <terceiro@debian.org>
+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 <terceiro@debian.org>
+---
+ 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
+
diff --git a/package/catatonit/Config.in b/package/catatonit/Config.in
new file mode 100644
index 0000000000..fbc7d90390
--- /dev/null
+++ b/package/catatonit/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_CATATONIT
+	bool "catatonit"
+	help
+	  catatonit is a simple but valid init binary to act as
+	  PID 1 for containers.
+
+	  https://github.com/openSUSE/catatonit
diff --git a/package/catatonit/catatonit.hash b/package/catatonit/catatonit.hash
new file mode 100644
index 0000000000..9b7420cdb7
--- /dev/null
+++ b/package/catatonit/catatonit.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256  e22bc72ebc23762dad8f5d2ed9d5ab1aaad567bdd54422f1d1da775277a93296  catatonit-0.1.7.tar.gz
+sha256  3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986  COPYING
diff --git a/package/catatonit/catatonit.mk b/package/catatonit/catatonit.mk
new file mode 100644
index 0000000000..3dd58eff1d
--- /dev/null
+++ b/package/catatonit/catatonit.mk
@@ -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))
-- 
2.37.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread