mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
bump version to 2022.02.9
add miyoo_defconfig
This commit is contained in:
tiopex
@@ -0,0 +1,56 @@
|
||||
From 7c6ec620de3f99d4212f4a54aa576df1b97020ab Mon Sep 17 00:00:00 2001
|
||||
From: Ondrej Kozina <okozina@redhat.com>
|
||||
Date: Wed, 2 Feb 2022 11:34:57 +0100
|
||||
Subject: [PATCH] Add check program for symver attribute.
|
||||
|
||||
Fixes: #709.
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
||||
---
|
||||
configure.ac | 11 +++++++++++
|
||||
lib/libcryptsetup_symver.h | 8 +++-----
|
||||
2 files changed, 14 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index a0e5990d..b052f8cf 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -554,6 +554,17 @@ if test "x$enable_static_cryptsetup" = "xyes"; then
|
||||
PKG_CONFIG=$saved_PKG_CONFIG
|
||||
fi
|
||||
|
||||
+dnl Check compiler support for symver function attribute
|
||||
+saved_CFLAGS=$CFLAGS
|
||||
+CFLAGS="-O0 -Werror"
|
||||
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
||||
+ void _test_sym(void);
|
||||
+ __attribute__((__symver__("sym@VERSION_4.2"))) void _test_sym(void) {}
|
||||
+]],
|
||||
+[[ _test_sym() ]]
|
||||
+)],[ AC_DEFINE([HAVE_ATTRIBUTE_SYMVER], 1, [Define to 1 to use __attribute__((symver))])])
|
||||
+CFLAGS=$saved_CFLAGS
|
||||
+
|
||||
AC_MSG_CHECKING([for systemd tmpfiles config directory])
|
||||
PKG_CHECK_VAR([systemd_tmpfilesdir], [systemd], [tmpfilesdir], [], [systemd_tmpfilesdir=no])
|
||||
AC_MSG_RESULT([$systemd_tmpfilesdir])
|
||||
diff --git a/lib/libcryptsetup_symver.h b/lib/libcryptsetup_symver.h
|
||||
index 2a804b6a..3558310d 100644
|
||||
--- a/lib/libcryptsetup_symver.h
|
||||
+++ b/lib/libcryptsetup_symver.h
|
||||
@@ -67,11 +67,9 @@
|
||||
* under CRYPT_SYMBOL_EXPORT_OLD(int, crypt_func_X, ...) macro
|
||||
*/
|
||||
|
||||
-#ifdef __has_attribute
|
||||
-# if __has_attribute(symver)
|
||||
-# define _CRYPT_SYMVER(_local_sym, _public_sym, _ver_str, _maj, _min) \
|
||||
- __attribute__((__symver__(#_public_sym _ver_str #_maj "." #_min)))
|
||||
-# endif
|
||||
+#if HAVE_ATTRIBUTE_SYMVER
|
||||
+# define _CRYPT_SYMVER(_local_sym, _public_sym, _ver_str, _maj, _min) \
|
||||
+ __attribute__((__symver__(#_public_sym _ver_str #_maj "." #_min)))
|
||||
#endif
|
||||
|
||||
#if !defined(_CRYPT_SYMVER) && defined(__GNUC__)
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
From 567e7f8664c621f8aeaa95d9f4ab4b590574f572 Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Wed, 15 Aug 2018 14:13:46 +0300
|
||||
Subject: [PATCH] Remove json_object typedef
|
||||
|
||||
The json-c header already defines the same typedef. While C11 allows
|
||||
typedef redefinition to the same type, older versions of gcc disallow
|
||||
that.
|
||||
|
||||
In file included from lib/luks2/luks2_internal.h:32,
|
||||
from lib/luks2/luks2_disk_metadata.c:24:
|
||||
lib/luks2/luks2.h:86: error: redefinition of typedef 'json_object'
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
[Upstream status:
|
||||
https://gitlab.com/cryptsetup/cryptsetup/-/merge_requests/91]
|
||||
---
|
||||
lib/luks2/luks2.h | 1 -
|
||||
lib/setup.c | 1 +
|
||||
2 files changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/luks2/luks2.h b/lib/luks2/luks2.h
|
||||
index ee57b41ba974..25e36190da45 100644
|
||||
--- a/lib/luks2/luks2.h
|
||||
+++ b/lib/luks2/luks2.h
|
||||
@@ -83,7 +83,6 @@ struct luks2_hdr_disk {
|
||||
/*
|
||||
* LUKS2 header in-memory.
|
||||
*/
|
||||
-typedef struct json_object json_object;
|
||||
struct luks2_hdr {
|
||||
size_t hdr_size;
|
||||
uint64_t seqid;
|
||||
diff --git a/lib/setup.c b/lib/setup.c
|
||||
index fddbe7ef7897..856f6e80f465 100644
|
||||
--- a/lib/setup.c
|
||||
+++ b/lib/setup.c
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <sys/utsname.h>
|
||||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
+#include <json-c/json.h>
|
||||
|
||||
#include "libcryptsetup.h"
|
||||
#include "luks.h"
|
||||
--
|
||||
2.18.0
|
||||
|
||||
@@ -4,6 +4,8 @@ config BR2_PACKAGE_CRYPTSETUP
|
||||
depends on BR2_USE_MMU # lvm2, libargon2
|
||||
depends on !BR2_STATIC_LIBS # lvm2, libargon2
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
|
||||
select BR2_PACKAGE_ARGP_STANDALONE if BR2_PACKAGE_LIBSSH && \
|
||||
(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL)
|
||||
select BR2_PACKAGE_POPT
|
||||
select BR2_PACKAGE_LVM2
|
||||
select BR2_PACKAGE_UTIL_LINUX
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/sha256sums.asc
|
||||
sha256 3bca4ffe39e2f94cef50f6ea65acb873a6dbce5db34fc6bcefe38b6d095e82df cryptsetup-2.3.3.tar.xz
|
||||
# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/sha256sums.asc
|
||||
sha256 fc0df945188172264ec5bf1d0bda08264fadc8a3f856d47eba91f31fe354b507 cryptsetup-2.4.3.tar.xz
|
||||
sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING
|
||||
sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL
|
||||
|
||||
@@ -4,16 +4,23 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CRYPTSETUP_VERSION_MAJOR = 2.3
|
||||
CRYPTSETUP_VERSION_MAJOR = 2.4
|
||||
CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).3
|
||||
CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz
|
||||
CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR)
|
||||
CRYPTSETUP_DEPENDENCIES = lvm2 popt util-linux host-pkgconf json-c libargon2 \
|
||||
CRYPTSETUP_DEPENDENCIES = \
|
||||
lvm2 popt host-pkgconf json-c libargon2 \
|
||||
$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
|
||||
$(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs,util-linux) \
|
||||
$(TARGET_NLS_DEPENDENCIES)
|
||||
CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library)
|
||||
CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL
|
||||
CRYPTSETUP_CPE_ID_VENDOR = cryptsetup_project
|
||||
CRYPTSETUP_INSTALL_STAGING = YES
|
||||
|
||||
# 0001-Add-check-program-for-symver-attribute.patch
|
||||
CRYPTSETUP_AUTORECONF = YES
|
||||
|
||||
CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)"
|
||||
CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2
|
||||
|
||||
@@ -30,6 +37,19 @@ else
|
||||
CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSSH),y)
|
||||
CRYPTSETUP_DEPENDENCIES += \
|
||||
$(if $(BR2_PACKAGE_ARGP_STANDALONE),argp-standalone) \
|
||||
libssh
|
||||
CRYPTSETUP_CONF_OPTS += --enable-ssh-token
|
||||
else
|
||||
CRYPTSETUP_CONF_OPTS += --disable-ssh-token
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
|
||||
CRYPTSETUP_CONF_OPTS += --with-tmpfilesdir=/usr/lib/tmpfiles.d
|
||||
endif
|
||||
|
||||
HOST_CRYPTSETUP_DEPENDENCIES = \
|
||||
host-pkgconf \
|
||||
host-lvm2 \
|
||||
@@ -40,7 +60,9 @@ HOST_CRYPTSETUP_DEPENDENCIES = \
|
||||
|
||||
HOST_CRYPTSETUP_CONF_OPTS = --with-crypto_backend=openssl \
|
||||
--disable-kernel_crypto \
|
||||
--enable-blkid
|
||||
--disable-ssh-token \
|
||||
--enable-blkid \
|
||||
--with-tmpfilesdir=no
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user