initial buildroot for linux 5.15
This commit is contained in:
@@ -0,0 +1,46 @@
|
||||
From b879e6886498fdd147287bffdf5867378c7f3299 Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Thu, 24 Jun 2021 14:28:10 +0300
|
||||
Subject: [PATCH] daemon: fix build with musl libc (again)
|
||||
|
||||
Commit 6b28c54dd95b3 added HAVE_SYS_TTYDEFAULTS_H to guard
|
||||
sys/ttydefaults.h include. This breaks musl libc build because
|
||||
HAVE_SYS_TTYDEFAULTS_H is not defined until config.h is included.
|
||||
|
||||
Move sys/ttydefaults.h include below config.h
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: https://github.com/raforg/daemon/pull/4
|
||||
|
||||
daemon.c | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/daemon.c b/daemon.c
|
||||
index 5c5ef2cb86df..f88a0d49bf84 100644
|
||||
--- a/daemon.c
|
||||
+++ b/daemon.c
|
||||
@@ -1011,9 +1011,6 @@ I<elogind(8)>
|
||||
#ifdef _RESTORE_POSIX_SOURCE
|
||||
#define _POSIX_SOURCE
|
||||
#endif
|
||||
-#ifdef HAVE_SYS_TTYDEFAULTS_H /* For CEOF in musl libc (Linux only) */
|
||||
-#include <sys/ttydefaults.h>
|
||||
-#endif
|
||||
#include <dirent.h>
|
||||
#include <sys/wait.h>
|
||||
#include <sys/stat.h>
|
||||
@@ -1037,6 +1034,10 @@ I<elogind(8)>
|
||||
#include <systemd/sd-login.h>
|
||||
#endif
|
||||
|
||||
+#ifdef HAVE_SYS_TTYDEFAULTS_H /* For CEOF in musl libc (Linux only) */
|
||||
+#include <sys/ttydefaults.h>
|
||||
+#endif
|
||||
+
|
||||
/* Configuration file entries */
|
||||
|
||||
typedef struct Config Config;
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
From fc84d8d572ffcecb533fd6d6d025abea12ce027e Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <fc84d8d572ffcecb533fd6d6d025abea12ce027e.1622722814.git.baruch@tkos.co.il>
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Thu, 3 Jun 2021 15:01:10 +0300
|
||||
Subject: [PATCH] Fix build with NDEBUG defined
|
||||
|
||||
Build with NDEBUG fails because the debug() macro becomes empty. This
|
||||
creates invalid syntax with the debug() call is the only statement in
|
||||
the body of a 'for' loop.
|
||||
|
||||
This fixes build failures like:
|
||||
|
||||
daemon.c: In function 'show':
|
||||
daemon.c:3607:2: error: expected expression before '}' token
|
||||
}
|
||||
^
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: https://github.com/raforg/daemon/pull/3
|
||||
|
||||
libslack/err.h | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/libslack/err.h b/libslack/err.h
|
||||
index 106bdb01e074..7acfbe46d60a 100644
|
||||
--- a/libslack/err.h
|
||||
+++ b/libslack/err.h
|
||||
@@ -40,10 +40,10 @@
|
||||
#undef check
|
||||
|
||||
#ifdef NDEBUG
|
||||
-#define debug(args)
|
||||
-#define vdebug(args)
|
||||
-#define debugsys(args)
|
||||
-#define vdebugsys(args)
|
||||
+#define debug(args) do {} while (0);
|
||||
+#define vdebug(args) do {} while (0);
|
||||
+#define debugsys(args) do {} while (0);
|
||||
+#define vdebugsys(args) do {} while (0);
|
||||
#define check(cond, mesg) (void_cast(0))
|
||||
#else
|
||||
#define debug(args) debugf args;
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
config BR2_PACKAGE_DAEMON
|
||||
bool "daemon"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
help
|
||||
Daemon turns other process into daemons.
|
||||
|
||||
http://www.libslack.org/daemon/
|
||||
|
||||
comment "daemon needs a toolchain w/ threads"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
@@ -0,0 +1,5 @@
|
||||
# From http://www.libslack.org/daemon/
|
||||
sha256 74f12e6d4b3c85632489bd08431d3d997bc17264bf57b7202384f2e809cff596 daemon-0.8.tar.gz
|
||||
# Locally calculated
|
||||
sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE
|
||||
sha256 91329bb9be4ae0b7800081fa054e9bb760c60005b26958c1fb8461bc66bcd998 COPYING
|
||||
@@ -0,0 +1,26 @@
|
||||
################################################################################
|
||||
#
|
||||
# daemon
|
||||
#
|
||||
################################################################################
|
||||
|
||||
DAEMON_VERSION = 0.8
|
||||
DAEMON_SITE = http://libslack.org/daemon/download
|
||||
DAEMON_LICENSE = GPL-2.0+
|
||||
DAEMON_LICENSE_FILES = LICENSE COPYING
|
||||
|
||||
define DAEMON_CONFIGURE_CMDS
|
||||
(cd $(@D); ./configure)
|
||||
endef
|
||||
|
||||
define DAEMON_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
|
||||
endef
|
||||
|
||||
define DAEMON_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) DEB_BUILD_OPTIONS=nostrip \
|
||||
$(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(@D) \
|
||||
install-daemon-bin
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
Reference in New Issue
Block a user