isa/citadel
1
0
Fork 0
forked from brl/citadel
Code Pull Requests Activity

recipes-support recipe updates

Browse Source
This commit is contained in:
Bruce Leidl 2019-01-15 12:34:27 -05:00
parent 468b36fceb
commit a4df26495e
35 changed files with 465 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-citadel/recipes-support/btrfs-tools/btrfs-tools_%.bbappend Normal file
View File

@ -0,0 +1,4 @@
# Put python library into a separate package and avoid dragging in python as RDEPENDS
PACKAGES =+ "${PN}-python"
FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}"
RDEPENDS_${PN}_remove = "${PYTHON_PN}-core"

16
meta-citadel/recipes-support/cryptsetup/cryptsetup_1.7.4.bb → meta-citadel/recipes-support/cryptsetup/cryptsetup_2.0.4.bb
View File

@ -4,16 +4,16 @@ device-mapper mappings. These include plain dm-crypt volumes and \
LUKS volumes. The difference is that LUKS uses a metadata header \
and can hence offer more features than plain dm-crypt. On the other \
hand, the header is visible and vulnerable to damage."
HOMEPAGE = "http://code.google.com/p/cryptsetup/"
HOMEPAGE = "https://gitlab.com/cryptsetup/cryptsetup"
SECTION = "console"
LICENSE = "GPL-2.0-with-OpenSSL-exception"
LIC_FILES_CHKSUM = "file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326"
DEPENDS = "util-linux libdevmapper popt libgcrypt"
DEPENDS = "util-linux libdevmapper popt libgcrypt json-c"
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v1.7/${BP}.tar.xz"
SRC_URI[md5sum] = "058ed35c5b776032c2a036838f9e22a7"
SRC_URI[sha256sum] = "7ccf893ef79a38fb92d61f03c17b964982119f5319cdaa85a1335b8558cca016"
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v2.0/${BP}.tar.xz"
SRC_URI[md5sum] = "ed42b31f67d05b05e392d1943d467b8d"
SRC_URI[sha256sum] = "9d3a3c7033293e0c97f0ad0501fd5b4d4913ae497cbf70cca06633ccc54b5734"
inherit autotools gettext pkgconfig
@ -23,10 +23,6 @@ PACKAGECONFIG ??= "openssl"
PACKAGECONFIG[openssl] = "--with-crypto_backend=openssl,,openssl"
PACKAGECONFIG[gcrypt] = "--with-crypto_backend=gcrypt,,libgcrypt"
RDEPENDS_${PN} += "lvm2 lvm2-udevrules"
RDEPENDS_${PN}_class-native = ""
RRECOMMENDS_${PN} = "kernel-module-aes-generic \
kernel-module-dm-crypt \
kernel-module-md5 \
@ -37,4 +33,6 @@ RRECOMMENDS_${PN} = "kernel-module-aes-generic \
EXTRA_OECONF = "--enable-static"
FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/cryptsetup.conf', '', d)}"
BBCLASSEXTEND = "native nativesdk"

3
meta-citadel/recipes-support/efibootmgr/efibootmgr_0.16.bb → meta-citadel/recipes-support/efibootmgr/efibootmgr_17.bb
View File

@ -10,8 +10,9 @@ DEPENDS = "pciutils zlib efivar"
COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
SRCREV = "a5103251a11663adddc85c86e0b8d3d3b73cbb4a"
SRCREV = "e067160ecef8208e1944002e5d50b275733211fb"
SRC_URI = "git://github.com/rhinstaller/efibootmgr.git;protocol=https \
file://0001-remove-extra-decl.patch \
"
S = "${WORKDIR}/git"

31
meta-citadel/recipes-support/efibootmgr/files/0001-remove-extra-decl.patch Normal file
View File

@ -0,0 +1,31 @@
From 99b578501643377e0b1994b2a068b790d189d5ad Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Wed, 13 Jun 2018 09:41:01 -0400
Subject: [PATCH] remove extra decl
Signed-off-by: Peter Jones <pjones@redhat.com>
Upstream-Status: Backport [git://github.com/rhinstaller/efibootmgr.git]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
src/efibootmgr.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/efibootmgr.c b/src/efibootmgr.c
index de38f01..4e1a680 100644
--- a/src/efibootmgr.c
+++ b/src/efibootmgr.c
@@ -1536,9 +1536,6 @@ parse_opts(int argc, char **argv)
"invalid numeric value %s\n",
optarg);
}
- /* XXX efivar-36 accidentally doesn't have a public
- * header for this */
- extern int efi_set_verbose(int verbosity, FILE *errlog);
efi_set_verbose(opts.verbose - 2, stderr);
break;
case 'V':
--
2.7.4

2
meta-citadel/recipes-support/efivar/efivar_36.bb → meta-citadel/recipes-support/efivar/efivar_37.bb
View File

@ -12,7 +12,7 @@ inherit pkgconfig
COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
SRCREV = "ef3449223ecd1e7b1098c523d66b2f960fe839ea"
SRCREV = "c1d6b10e1ed4ba2be07f385eae5bceb694478a10"
SRC_URI = "git://github.com/rhinstaller/efivar.git \
file://allow-multi-definitions-for-native.patch \
"

2
meta-citadel/recipes-support/libblockdev/libblockdev_%.bbappend Normal file
View File

@ -0,0 +1,2 @@
PACKAGECONFIG = "fs crypto parted mdraid"

6
meta-citadel/recipes-support/libblockdev/libblockdev_2.18.bb → meta-citadel/recipes-support/libblockdev/libblockdev_2.20.bb
View File

@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c"
inherit autotools python3native gobject-introspection
SRCREV = "0debeb45562ac3d8f6f43f6f942b238abab55be9"
SRCREV = "cb308566c3c5222b8422f78997a1742713b265a9"
SRC_URI = " \
git://github.com/rhinstaller/libblockdev;branch=master \
"
@ -19,7 +19,7 @@ S = "${WORKDIR}/git"
FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}"
PACKAGECONFIG ??= "python3 lvm dm kmod parted fs escrow btrfs crypto mdraid kbd mpath"
PACKAGECONFIG ??= "python3 lvm dm kmod parted fs escrow btrfs crypto mdraid kbd mpath nvdimm"
PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3"
PACKAGECONFIG[python2] = "--with-python2, --without-python2,,python2"
PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools, lvm2"
@ -30,7 +30,7 @@ PACKAGECONFIG[kmod] = "--with-kbd, --without-kbd, kmod"
PACKAGECONFIG[parted] = "--with-part, --without-part, parted"
PACKAGECONFIG[fs] = "--with-fs, --without-fs, util-linux"
PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native"
PACKAGECONFIG[nvdimm] = "--with-nvdimm, --without-nvdimm"
PACKAGECONFIG[nvdimm] = "--with-nvdimm, --without-nvdimm, ndctl util-linux"
PACKAGECONFIG[vdo] = "--with-vdo, --without-vdo"
PACKAGECONFIG[escrow] = "--with-escrow, --without-escrow, nss volume-key"
PACKAGECONFIG[btrfs] = "--with-btrfs,--without-btrfs,libbytesize btrfs-tools"

1
meta-citadel/recipes-support/libbytesize/libbytesize_%.bbappend Normal file
View File

@ -0,0 +1 @@
PACKAGECONFIG = ""

3
meta-citadel/recipes-support/libbytesize/libbytesize_1.3.bb → meta-citadel/recipes-support/libbytesize/libbytesize_1.4.bb
View File

@ -9,8 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c"
S = "${WORKDIR}/git"
B = "${S}"
SRCREV = "b0dcf6f457d700127b43c0e0a198253c266b78ae"
PV = "1.3+git${SRCPV}"
SRCREV = "ebbda2217d177d2a17f917d7a3e3d132a26db791"
SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master \
"

11
meta-citadel/recipes-support/libgit2/libgit2_0.24.3.bb → meta-citadel/recipes-support/libgit2/libgit2_0.27.4.bb
View File

@ -1,12 +1,13 @@
SUMMARY = "the Git linkable library"
HOMEPAGE = "http://libgit2.github.com/"
LICENSE = "GPL-2.0-with-GCC-exception"
LIC_FILES_CHKSUM = "file://COPYING;md5=34197a479f637beb9e09e56893f48bc2"
LICENSE = "GPL-2.0-with-GCC-exception & MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=3f2cd5d3cccd71d62066ba619614592b"
DEPENDS = "curl openssl zlib libssh2"
DEPENDS = "curl openssl zlib libssh2 libgcrypt"
SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v0.24"
SRCREV = "4cf1ec7cff28da8838a2f0a9fb330e312ea3f963"
SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v0.27"
#v0.27.5
SRCREV = "8e0b172981a046d19f1d9efa5acd6186bccbd3ce"
S = "${WORKDIR}/git"

7
meta-citadel/recipes-support/libsass/libsass_3.4.7.bb → meta-citadel/recipes-support/libsass/libsass_3.5.5.bb
View File

@ -3,9 +3,10 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d \
file://LICENSE;md5=2f8a76980411a3f1f1480b141ce06744"
SRC_URI = "https://github.com/sass/libsass/archive/${PV}.tar.gz;downloadfilename=${PN}-${PV}.tar.gz"
SRC_URI[md5sum] = "dcac228e89511d25ea926aa3d98d7b44"
SRC_URI[sha256sum] = "855c40528b897d06ae4d24606c2db3cd09bb38de5b46b28e835f9d4fd4d7ab95"
SRC_URI = "git://github.com/sass/libsass.git;protocol=git;branch=3.5-stable"
SRCREV = "39e30874b9a5dd6a802c20e8b0470ba44eeba929"
S = "${WORKDIR}/git"
inherit autotools

119
meta-citadel/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch
View File

@ -1,33 +1,34 @@
From 916ea0c70fd063ab7b81f16fd917a75dc02edf4f Mon Sep 17 00:00:00 2001
From: Peter Kjellerstedt <pkj@axis.com>
Date: Fri, 17 Mar 2017 03:18:28 +0100
Subject: [PATCH] Avoid bashisms in init scripts
From ea66faf68c93735edb1f2691cd7364b8cab83fef Mon Sep 17 00:00:00 2001
From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Date: Mon, 26 Nov 2018 14:53:09 +0800
Subject: [PATCH 1/3] Avoid bashisms in init scripts
Upstream-Status: Inappropriate
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Rebase to 2.03.01
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
scripts/blk_availability_init_red_hat.in | 4 ++--
scripts/clvmd_init_red_hat.in | 6 +++---
scripts/cmirrord_init_red_hat.in | 4 ++--
scripts/lvm2_cluster_activation_red_hat.sh.in | 4 ++--
scripts/lvm2_lvmetad_init_red_hat.in | 4 ++--
scripts/lvm2_lvmpolld_init_red_hat.in | 4 ++--
scripts/lvm2_monitoring_init_red_hat.in | 4 ++--
scripts/lvm2_monitoring_init_rhel4 | 4 ++--
8 files changed, 17 insertions(+), 17 deletions(-)
scripts/blk_availability_init_red_hat.in | 4 ++--
scripts/cmirrord_init_red_hat.in | 4 ++--
scripts/lvm2_lvmpolld_init_red_hat.in | 4 ++--
scripts/lvm2_monitoring_init_red_hat.in | 4 ++--
scripts/lvm2_monitoring_init_rhel4 | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in
index a84ffe7..6b855b7 100644
index 347c395..b2e9cf9 100644
--- a/scripts/blk_availability_init_red_hat.in
+++ b/scripts/blk_availability_init_red_hat.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# Copyright (C) 2012 Red Hat, Inc. All rights reserved.
# Copyright (C) 2012-2017 Red Hat, Inc. All rights reserved.
#
@@ -53,6 +53,6 @@ case "$1" in
@@ -51,6 +51,6 @@ case "$1" in
status)
;;
*)
@ -35,36 +36,8 @@ index a84ffe7..6b855b7 100644
+ echo "Usage: $0 {start|stop|status}"
;;
esac
diff --git a/scripts/clvmd_init_red_hat.in b/scripts/clvmd_init_red_hat.in
index d7f3392..abc8011 100644
--- a/scripts/clvmd_init_red_hat.in
+++ b/scripts/clvmd_init_red_hat.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# clvmd - Clustered LVM Daemon init script
#
@@ -161,7 +161,7 @@ restart() {
fi
}
-[ "$EUID" != "0" ] && {
+[ "$(id -u)" != "0" ] && {
echo "clvmd init script can only be executed as root user"
exit 4
}
@@ -206,7 +206,7 @@ case "$1" in
;;
*)
- echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+ echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
rtrn=2
;;
esac
diff --git a/scripts/cmirrord_init_red_hat.in b/scripts/cmirrord_init_red_hat.in
index d4b7e37..d442cbc 100755
index c82f8f5..a3a321d 100755
--- a/scripts/cmirrord_init_red_hat.in
+++ b/scripts/cmirrord_init_red_hat.in
@@ -1,4 +1,4 @@
@ -73,7 +46,7 @@ index d4b7e37..d442cbc 100755
#
# chkconfig: - 22 78
# description: Starts and stops cmirrord
@@ -101,7 +101,7 @@ case "$1" in
@@ -103,7 +103,7 @@ case "$1" in
;;
*)
@ -82,34 +55,15 @@ index d4b7e37..d442cbc 100755
;;
esac
diff --git a/scripts/lvm2_cluster_activation_red_hat.sh.in b/scripts/lvm2_cluster_activation_red_hat.sh.in
index abea026..d8cba2e 100644
--- a/scripts/lvm2_cluster_activation_red_hat.sh.in
+++ b/scripts/lvm2_cluster_activation_red_hat.sh.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
sbindir=@sbindir@
@@ -54,7 +54,7 @@ case "$1" in
rtrn=$?
;;
*)
- echo $"Usage: $0 {activate|deactivate}"
+ echo "Usage: $0 {activate|deactivate}"
rtrn=3
;;
esac
diff --git a/scripts/lvm2_lvmetad_init_red_hat.in b/scripts/lvm2_lvmetad_init_red_hat.in
index b2f5d50..96269a9 100644
--- a/scripts/lvm2_lvmetad_init_red_hat.in
+++ b/scripts/lvm2_lvmetad_init_red_hat.in
diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in b/scripts/lvm2_lvmpolld_init_red_hat.in
index 176ff5d..825f6ad 100644
--- a/scripts/lvm2_lvmpolld_init_red_hat.in
+++ b/scripts/lvm2_lvmpolld_init_red_hat.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# Copyright (C) 2012 Red Hat, Inc. All rights reserved.
# Copyright (C) 2015 Red Hat, Inc. All rights reserved.
#
@@ -105,7 +105,7 @@ case "$1" in
;;
@ -120,27 +74,8 @@ index b2f5d50..96269a9 100644
;;
esac
diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in b/scripts/lvm2_lvmpolld_init_red_hat.in
index c521955..cdbaece 100644
--- a/scripts/lvm2_lvmpolld_init_red_hat.in
+++ b/scripts/lvm2_lvmpolld_init_red_hat.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# Copyright (C) 2015 Red Hat, Inc. All rights reserved.
#
@@ -107,7 +107,7 @@ case "$1" in
;;
*)
- echo $"Usage: $0 {start|stop|force-stop|restart|condrestart|try-restart|status}"
+ echo "Usage: $0 {start|stop|force-stop|restart|condrestart|try-restart|status}"
;;
esac
diff --git a/scripts/lvm2_monitoring_init_red_hat.in b/scripts/lvm2_monitoring_init_red_hat.in
index de7ff0d..9ff6bb7 100644
index 95e4125..dff89cd 100644
--- a/scripts/lvm2_monitoring_init_red_hat.in
+++ b/scripts/lvm2_monitoring_init_red_hat.in
@@ -1,4 +1,4 @@
@ -149,7 +84,7 @@ index de7ff0d..9ff6bb7 100644
#
# Copyright (C) 2007-2009 Red Hat, Inc. All rights reserved.
#
@@ -128,7 +128,7 @@ case "$1" in
@@ -127,7 +127,7 @@ case "$1" in
;;
*)
@ -178,5 +113,5 @@ index 8eb06c5..2e8d0f7 100644
esac
--
2.12.0
2.7.4

29
meta-citadel/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch
View File

@ -19,11 +19,11 @@ Signed-off-by: Dengke Du <dengke.du@windriver.com>
tools/lvmcmdline.c | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/lib/log/log.c b/lib/log/log.c
index c933154..3581084 100644
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -161,6 +161,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_
Index: LVM2.2.02.177/lib/log/log.c
===================================================================
--- LVM2.2.02.177.orig/lib/log/log.c
+++ LVM2.2.02.177/lib/log/log.c
@@ -161,6 +161,7 @@ static void _check_and_replace_standard_
* Close and reopen standard stream on file descriptor fd.
*/
int reopen_standard_stream(FILE **stream, const char *mode)
@ -31,7 +31,7 @@ index c933154..3581084 100644
{
int fd, fd_copy, new_fd;
const char *name;
@@ -207,6 +208,11 @@ int reopen_standard_stream(FILE **stream, const char *mode)
@@ -207,6 +208,11 @@ int reopen_standard_stream(FILE **stream
*stream = new_stream;
return 1;
}
@ -43,11 +43,11 @@ index c933154..3581084 100644
void init_log_fn(lvm2_log_fn_t log_fn)
{
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 9a4deb7..f1f18e6 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -1818,7 +1818,7 @@ static int _check_standard_fds(void)
Index: LVM2.2.02.177/tools/lvmcmdline.c
===================================================================
--- LVM2.2.02.177.orig/tools/lvmcmdline.c
+++ LVM2.2.02.177/tools/lvmcmdline.c
@@ -3095,7 +3095,7 @@ static int _check_standard_fds(void)
int err = is_valid_fd(STDERR_FILENO);
if (!is_valid_fd(STDIN_FILENO) &&
@ -56,7 +56,7 @@ index 9a4deb7..f1f18e6 100644
if (err)
perror("stdin stream open");
else
@@ -1828,7 +1828,7 @@ static int _check_standard_fds(void)
@@ -3105,7 +3105,7 @@ static int _check_standard_fds(void)
}
if (!is_valid_fd(STDOUT_FILENO) &&
@ -65,7 +65,7 @@ index 9a4deb7..f1f18e6 100644
if (err)
perror("stdout stream open");
/* else no stdout */
@@ -1836,7 +1836,7 @@ static int _check_standard_fds(void)
@@ -3113,7 +3113,7 @@ static int _check_standard_fds(void)
}
if (!is_valid_fd(STDERR_FILENO) &&
@ -74,6 +74,3 @@ index 9a4deb7..f1f18e6 100644
printf("stderr stream open: %s\n",
strerror(errno));
return 0;
--
2.12.0

13
meta-citadel/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch
View File

@ -12,11 +12,11 @@ Signed-off-by: Dengke Du <dengke.du@windriver.com>
lib/mm/memlock.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c
index da90144..f34f890 100644
--- a/lib/mm/memlock.c
+++ b/lib/mm/memlock.c
@@ -150,7 +150,7 @@ static void _touch_memory(void *mem, size_t size)
Index: LVM2.2.02.177/lib/mm/memlock.c
===================================================================
--- LVM2.2.02.177.orig/lib/mm/memlock.c
+++ LVM2.2.02.177/lib/mm/memlock.c
@@ -151,7 +151,7 @@ static void _touch_memory(void *mem, siz
static void _allocate_memory(void)
{
@ -25,6 +25,3 @@ index da90144..f34f890 100644
void *stack_mem;
struct rlimit limit;
int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks;
--
2.12.0

28
meta-citadel/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch
View File

@ -1,6 +1,6 @@
From 0012ea63f6070a5d41fa380970f9c30b953237d2 Mon Sep 17 00:00:00 2001
From: Dengke Du <dengke.du@windriver.com>
Date: Tue, 25 Oct 2016 11:59:40 +0000
From 3bba45890985b877b823836e78a1c8ac3c878856 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Tue, 31 Jul 2018 15:04:29 +0800
Subject: [PATCH 4/4] tweak MODPROBE_CMD for cross compile
Lvm uses variable MODPROBE_CMD at runtime, so build time detection of modprobe
@ -16,23 +16,23 @@ filter=["r|/loop1$|","r|/loop2$|","r|/loop3$|","r|/loop4$|","r|/loop5$|","r|/loo
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Dengke Du <dengke.du@windriver.com>
---
configure.in | 1 -
1 file changed, 1 deletion(-)
configure.ac | 2 --
1 file changed, 2 deletions(-)
diff --git a/configure.in b/configure.in
index cc77aab..a3579f2 100644
--- a/configure.in
+++ b/configure.in
@@ -1853,7 +1853,6 @@ if test "$UDEV_SYNC" = yes; then
diff --git a/configure.ac b/configure.ac
index e427708..aa374ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1791,8 +1791,6 @@ if test "$BUILD_DMFILEMAPD" = yes; then
fi
################################################################################
-AC_PATH_TOOL(MODPROBE_CMD, modprobe)
-AC_PATH_TOOL(MODPROBE_CMD, modprobe, [], [$PATH_SBIN])
-
if test -n "$MODPROBE_CMD"; then
AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe', if available.])
fi
--
2.9.3
2.7.4

45
meta-citadel/recipes-support/lvm2/files/0005-do-not-build-manual.patch
View File

@ -1,7 +1,7 @@
From d8bb25e34d6533ba78eaae697771ee499a66706f Mon Sep 17 00:00:00 2001
From 103ac1c1200df8190372d973e004776cffe8e659 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Wed, 2 Aug 2017 03:41:37 -0400
Subject: [PATCH] do not build manual
Date: Mon, 26 Nov 2018 14:59:55 +0800
Subject: [PATCH 2/3] do not build manual
On some host (ubuntu 1404), build manual failed.
...
@ -15,12 +15,12 @@ Upstream-Status: Pending
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
Makefile.in | 4 ++--
configure.in | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
Makefile.in | 6 +++---
configure.ac | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 31d428d..24f89a2 100644
index 6a1a990..80cba91 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@ top_builddir = @top_builddir@
@ -32,7 +32,16 @@ index 31d428d..24f89a2 100644
ifeq ("@UDEV_RULES@", "yes")
SUBDIRS += udev
@@ -69,7 +69,7 @@ liblvm.device-mapper: include.device-mapper
@@ -33,7 +33,7 @@ ifeq ($(MAKECMDGOALS),clean)
endif
# FIXME Should use intermediate Makefiles here!
ifeq ($(MAKECMDGOALS),distclean)
- SUBDIRS = conf include man test scripts \
+ SUBDIRS = conf include test scripts \
libdaemon lib tools daemons libdm \
udev po
tools.distclean: test.distclean
@@ -59,7 +59,7 @@ libdm.device-mapper: include.device-mapper
daemons.device-mapper: libdm.device-mapper
tools.device-mapper: libdm.device-mapper
scripts.device-mapper: include.device-mapper
@ -41,18 +50,18 @@ index 31d428d..24f89a2 100644
ifeq ("@INTL@", "yes")
lib.pofile: include.pofile
diff --git a/configure.in b/configure.in
index 1dc8819..108ace4 100644
--- a/configure.in
+++ b/configure.in
@@ -2213,7 +2213,6 @@ libdm/Makefile
diff --git a/configure.ac b/configure.ac
index 9c45745..8fee4c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1806,7 +1806,6 @@ libdaemon/server/Makefile
libdm/Makefile
libdm/dm-tools/Makefile
libdm/libdevmapper.pc
liblvm/Makefile
liblvm/liblvm2app.pc
-man/Makefile
po/Makefile
python/Makefile
python/setup.py
scripts/blkdeactivate.sh
scripts/blk_availability_init_red_hat
--
2.8.1
2.7.4

2
meta-citadel/recipes-support/lvm2/libaio_%.bbappend Normal file
View File

@ -0,0 +1,2 @@
# citadel-image.bbclass pulls in cryptsetup-native --> libdevmapper-native --> libaio-native
BBCLASSEXTEND = "native"

2
meta-citadel/recipes-support/lvm2/libdevmapper_%.bbappend Normal file
View File

@ -0,0 +1,2 @@
PACKAGECONFIG = "odirect"
PACKAGECONFIG_append_class-target = " udev"

3
meta-citadel/recipes-support/lvm2/libdevmapper_2.02.171.bb → meta-citadel/recipes-support/lvm2/libdevmapper_2.03.01.bb
View File

@ -1,7 +1,6 @@
require lvm2.inc
SRC_URI[md5sum] = "153b7bb643eb26073274968e9026fa8f"
SRC_URI[sha256sum] = "b815a711a2fabaa5c3dc1a4a284df0268bf0f325f0fc0f5c9530c9bbb54b9964"
SRCREV = "913c28917e62577a2ef67152b2e5159237503dda"
DEPENDS += "autoconf-archive-native"

15
meta-citadel/recipes-support/lvm2/lvm2.inc
View File

@ -1,13 +1,13 @@
HOMEPAGE = "https://www.sourceware.org/lvm2/"
SECTION = "utils"
DESCRIPTION = "LVM2 is a set of utilities to manage logical volumes in Linux."
LICENSE = "GPLv2 & LGPLv2"
LICENSE = "GPLv2 & LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=12713b4d9386533feeb07d6e4831765a \
file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24"
DEPENDS += "util-linux"
DEPENDS += "util-linux libaio"
SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \
SRC_URI = "git://github.com/lvmteam/lvm2.git;protocol=https;branch=master \
file://lvm.conf \
file://0001-implement-libc-specific-reopen_stream.patch \
file://0002-Guard-use-of-mallinfo-with-__GLIBC__.patch \
@ -17,13 +17,15 @@ SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \
file://0005-do-not-build-manual.patch \
file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \
"
S = "${WORKDIR}/LVM2.${PV}"
S = "${WORKDIR}/git"
inherit autotools-brokensep pkgconfig systemd license
LVM2_PACKAGECONFIG = "dmeventd lvmetad"
LVM2_PACKAGECONFIG = "dmeventd"
LVM2_PACKAGECONFIG_append_class-target = " \
${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \
${@incompatible_license_contains('GPLv3', '', 'thin-provisioning-tools', d)} \
udev \
"
@ -34,7 +36,6 @@ LVM2_PACKAGECONFIG_append_class-target = " \
PACKAGECONFIG ??= "odirect ${LVM2_PACKAGECONFIG}"
PACKAGECONFIG[dmeventd] = "--enable-dmeventd,--disable-dmeventd"
PACKAGECONFIG[lvmetad] = "--enable-lvmetad,--disable-lvmetad"
PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct"
PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline"
PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
@ -45,11 +46,11 @@ PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${n
EXTRA_OECONF = "--with-user= \
--with-group= \
--enable-realtime \
--enable-applib \
--enable-cmdlib \
--enable-pkgconfig \
--with-usrlibdir=${libdir} \
--with-systemdsystemunitdir=${systemd_system_unitdir} \
--disable-thin_check_needs_check \
--with-thin-check=${sbindir}/thin_check \
--with-thin-dump=${sbindir}/thin_dump \
--with-thin-repair=${sbindir}/thin_repair \

37
meta-citadel/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch
View File

@ -1,6 +1,6 @@
From 0a8e466fcf99622896e070c5133165e4278e8cfb Mon Sep 17 00:00:00 2001
From 3c16d9aaa46602e7594d717d86e7f02066d21134 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Thu, 25 May 2017 05:27:11 -0400
Date: Mon, 26 Nov 2018 17:20:20 +0800
Subject: [PATCH] explicitly do not install libdm
Already have package libdevmapper which split from lvm2,
@ -10,27 +10,46 @@ Upstream-Status: Inappropriate [meta-oe specific]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
libdm/Makefile.in | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
libdm/Makefile.in | 6 ++++--
libdm/dm-tools/Makefile.in | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/libdm/Makefile.in b/libdm/Makefile.in
index 3c9a4ce..45c91c6 100644
index 8c8334a..effcf25 100644
--- a/libdm/Makefile.in
+++ b/libdm/Makefile.in
@@ -77,9 +77,11 @@ ifeq ("@PKGCONFIG@", "yes")
@@ -81,9 +81,11 @@ ifeq ("@PKGCONFIG@", "yes")
INSTALL_TYPE += install_pkgconfig
endif
-install: $(INSTALL_TYPE) install_include
+install:
+ echo "Do not install device mappler in lvm2"
+ echo "Do not install device mapper in lvm2"
-install_device-mapper: install
+install_device-mapper:
+ echo "Do not install device mappler in lvm2"
+ echo "Do not install device mapper in lvm2"
install_include: $(srcdir)/libdevmapper.h
$(INSTALL_DATA) -D $< $(includedir)/$(<F)
diff --git a/libdm/dm-tools/Makefile.in b/libdm/dm-tools/Makefile.in
index 39d411d..4a0f61a 100644
--- a/libdm/dm-tools/Makefile.in
+++ b/libdm/dm-tools/Makefile.in
@@ -60,9 +60,11 @@ install_dmsetup_static: dmsetup.static
$(Q) $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)
$(Q) $(LN_S) -f $(<F) $(staticdir)/dmstats
-install_device-mapper: $(INSTALL_DMSETUP_TARGETS)
+install_device-mapper:
+ echo "Do not install device mapper in lvm2"
-install: install_device-mapper
+install:
+ echo "Do not install device mapper in lvm2"
# dmfilemapd support
ifeq ("@BUILD_DMFILEMAPD@", "yes")
--
2.8.1
2.7.4

171
meta-citadel/recipes-support/lvm2/lvm2/0001-fix-systemd-generator.patch Normal file
View File

@ -0,0 +1,171 @@
From b7a71bce5114db0b993a34565bd29bca04f9d71c Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Mon, 14 Jan 2019 18:22:30 -0500
Subject: [PATCH] fix systemd generator
---
Makefile.in | 1 -
configure.ac | 1 +
lib/config/config_settings.h | 9 +++++++++
scripts/Makefile.in | 1 +
scripts/generator-internals.c | 14 +++++++-------
scripts/lvm2-pvscan.service.in | 14 ++++++++++++++
.../lvm2_activation_generator_systemd_red_hat.c | 13 ++++++-------
7 files changed, 38 insertions(+), 15 deletions(-)
create mode 100644 scripts/lvm2-pvscan.service.in
diff --git a/Makefile.in b/Makefile.in
index 80cba91d1..d6e7bb8f2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -137,7 +137,6 @@ install_initscripts:
install_systemd_generators:
$(MAKE) -C scripts install_systemd_generators
- $(MAKE) -C man install_systemd_generators
install_systemd_units:
$(MAKE) -C scripts install_systemd_units
diff --git a/configure.ac b/configure.ac
index 8fee4c4f7..2e99d7b5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1807,6 +1807,7 @@ libdm/Makefile
libdm/dm-tools/Makefile
libdm/libdevmapper.pc
po/Makefile
+scripts/lvm2-pvscan.service
scripts/blkdeactivate.sh
scripts/blk_availability_init_red_hat
scripts/blk_availability_systemd_red_hat.service
diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
index 636446f76..63e172acc 100644
--- a/lib/config/config_settings.h
+++ b/lib/config/config_settings.h
@@ -997,6 +997,15 @@ cfg(global_lvdisplay_shows_full_device_path_CFG, "lvdisplay_shows_full_device_pa
"Previously this was always shown as /dev/vgname/lvname even when that\n"
"was never a valid path in the /dev filesystem.\n")
+cfg(global_event_activation_CFG, "event_activation", global_CFG_SECTION, 0, CFG_TYPE_BOOL, 1, vsn(2, 3, 1), 0, 0, NULL,
+ "Activate LVs based on system-generated device events.\n"
+ "When a device appears on the system, a system-generated event runs\n"
+ "the pvscan command to activate LVs if the new PV completes the VG.\n"
+ "Use auto_activation_volume_list to select which LVs should be\n"
+ "activated from these events (the default is all.)\n"
+ "When event_activation is disabled, the system will generally run\n"
+ "a direct activation command to activate LVs in complete VGs.\n")
+
cfg(global_use_lvmetad_CFG, "use_lvmetad", global_CFG_SECTION, 0, CFG_TYPE_BOOL, 0, vsn(2, 2, 93), 0, vsn(3, 0, 0), NULL,
"This setting is no longer used.\n")
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 039cac2e7..467e460ca 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -87,6 +87,7 @@ install_systemd_generators:
install_systemd_units: install_dbus_service
$(INSTALL_DIR) $(systemd_unit_dir)
+ $(INSTALL_DATA) lvm2-pvscan.service $(systemd_unit_dir)/lvm2-pvscan@.service
ifeq ("@BUILD_DMEVENTD@", "yes")
$(INSTALL_DATA) dm_event_systemd_red_hat.socket $(systemd_unit_dir)/dm-event.socket
$(INSTALL_DATA) dm_event_systemd_red_hat.service $(systemd_unit_dir)/dm-event.service
diff --git a/scripts/generator-internals.c b/scripts/generator-internals.c
index 00a15e547..a6c81b2e9 100644
--- a/scripts/generator-internals.c
+++ b/scripts/generator-internals.c
@@ -93,11 +93,11 @@ static bool _close_child(struct child_process *child)
//----------------------------------------------------------------
// Aquiring config from the lvmconfig process
-#define LVM_CONF_USE_LVMETAD "global/use_lvmetad"
-#define LVM_CONF_USE_LVMPOLLD "global/use_lvmpolld"
+#define LVM_CONF_EVENT_ACTIVATION "global/event_activation"
+#define LVM_CONF_USE_LVMPOLLD "global/use_lvmpolld"
struct config {
- bool use_lvmetad;
+ bool event_activation;
bool sysinit_needed;
};
@@ -153,8 +153,8 @@ static bool _parse_line(const char *line, struct config *cfg)
{
const char *val;
- if (_begins_with(line, "use_lvmetad=", &val)) {
- return _parse_bool(val, &cfg->use_lvmetad);
+ if (_begins_with(line, "event_activation=", &val)) {
+ return _parse_bool(val, &cfg->event_activation);
} else if (_begins_with(line, "use_lvmpolld=", &val)) {
bool r;
@@ -170,14 +170,14 @@ static bool _parse_line(const char *line, struct config *cfg)
static bool _get_config(struct config *cfg, const char *lvmconfig_path)
{
static const char *_argv[] = {
- "lvmconfig", LVM_CONF_USE_LVMETAD, LVM_CONF_USE_LVMPOLLD, NULL
+ "lvmconfig", LVM_CONF_EVENT_ACTIVATION, LVM_CONF_USE_LVMPOLLD, NULL
};
bool r = true;
char buffer[256];
struct child_process child;
- cfg->use_lvmetad = false;
+ cfg->event_activation = false;
cfg->sysinit_needed = true;
if (!_open_child(&child, lvmconfig_path, _argv)) {
diff --git a/scripts/lvm2-pvscan.service.in b/scripts/lvm2-pvscan.service.in
new file mode 100644
index 000000000..93fe062d0
--- /dev/null
+++ b/scripts/lvm2-pvscan.service.in
@@ -0,0 +1,14 @@
+[Unit]
+Description=LVM event activation on device %i
+Documentation=man:pvscan(8)
+DefaultDependencies=no
+StartLimitInterval=0
+BindsTo=dev-block-%i.device
+Before=shutdown.target
+Conflicts=shutdown.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=@SBINDIR@/lvm pvscan --cache --activate ay %i
+ExecStop=@SBINDIR@/lvm pvscan --cache %i
diff --git a/scripts/lvm2_activation_generator_systemd_red_hat.c b/scripts/lvm2_activation_generator_systemd_red_hat.c
index 5dc39ae03..0e6c05acc 100644
--- a/scripts/lvm2_activation_generator_systemd_red_hat.c
+++ b/scripts/lvm2_activation_generator_systemd_red_hat.c
@@ -150,12 +150,11 @@ static int generate_unit(struct generator *gen, int unit)
fputs("# Automatically generated by lvm2-activation-generator.\n"
"#\n"
- "# This unit is responsible for direct activation of LVM2 logical volumes\n"
- "# if lvmetad daemon is not used (global/use_lvmetad=0 lvm.conf setting),\n"
- "# hence volume autoactivation is not applicable.\n"
- "# Direct LVM2 activation requires udev to be settled!\n\n"
+ "# This unit is responsible for direct activation of LVM logical volumes\n"
+ "# if event-based activation not used (global/event_activation=0 in\n"
+ "# lvm.conf). Direct LVM activation requires udev to be settled!\n\n"
"[Unit]\n"
- "Description=Activation of LVM2 logical volumes\n"
+ "Description=LVM direct activation of logical volumes\n"
"Documentation=man:lvm2-activation-generator(8)\n"
"SourcePath=/etc/lvm/lvm.conf\n" "DefaultDependencies=no\n", f);
@@ -217,8 +216,8 @@ static bool _run(int argc, const char **argv)
if (!_get_config(&gen.cfg, LVMCONFIG_PATH))
return false;
- if (gen.cfg.use_lvmetad)
- // If lvmetad used, rely on autoactivation instead of direct activation.
+ if (gen.cfg.event_activation)
+ // If event_activation=1, pvscan --cache -aay does activation.
return true;
/* mark lvm2-activation.*.service as world-accessible */

16
meta-citadel/recipes-support/lvm2/lvm2_%.bbappend Normal file
View File

@ -0,0 +1,16 @@
PACKAGECONFIG = "odirect udev"
# files/lvm.conf is customized to prevent writing to /etc
#SRC_URI += "file://0001-fix-systemd-generator.patch"
#FILES_${PN} += "\
# ${systemd_system_unitdir}/lvm2-pvscan@.service \
# ${systemd_unitdir}/system-generators \
#"
FILES_${PN}-dev += "${libdir}/liblvm2cmd.so*"
#do_install_append() {
# oe_runmake 'DESTDIR=${D}' install install_systemd_generators
#}

24
meta-citadel/recipes-support/lvm2/lvm2_2.02.171.bb → meta-citadel/recipes-support/lvm2/lvm2_2.03.01.bb
View File

@ -1,12 +1,25 @@
require lvm2.inc
SRC_URI[md5sum] = "153b7bb643eb26073274968e9026fa8f"
SRC_URI[sha256sum] = "b815a711a2fabaa5c3dc1a4a284df0268bf0f325f0fc0f5c9530c9bbb54b9964"
SRCREV = "913c28917e62577a2ef67152b2e5159237503dda"
SRC_URI += "file://0001-explicitly-do-not-install-libdm.patch"
SRC_URI = "git://github.com/lvmteam/lvm2.git;protocol=https;branch=master \
file://lvm.conf \
file://0001-implement-libc-specific-reopen_stream.patch \
file://0002-Guard-use-of-mallinfo-with-__GLIBC__.patch \
file://0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch \
file://0004-tweak-MODPROBE_CMD-for-cross-compile.patch \
file://0001-Avoid-bashisms-in-init-scripts.patch \
file://0005-do-not-build-manual.patch \
file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \
file://0001-explicitly-do-not-install-libdm.patch \
"
DEPENDS += "autoconf-archive-native"
inherit multilib_script
MULTILIB_SCRIPTS = "${PN}:${sysconfdir}/lvm/lvm.conf"
CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe"
do_install_append() {
@ -28,12 +41,13 @@ PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules"
SYSTEMD_PACKAGES = "${PN}"
SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'lvmetad', 'lvm2-lvmetad.socket lvm2-pvscan@.service', '', d)} \
blk-availability.service"
SYSTEMD_AUTO_ENABLE = "disable"
TARGET_CC_ARCH += "${LDFLAGS}"
EXTRA_OECONF_append_class-nativesdk = " --with-confdir=${sysconfdir}"
FILES_${PN} += "${libdir}/device-mapper/*.so"
FILES_${PN}-scripts = " \
${sbindir}/blkdeactivate \
@ -44,7 +58,9 @@ FILES_${PN}-scripts = " \
# Specified explicitly for the udev rules, just in case that it does not get picked
# up automatically:
FILES_${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d"
RDEPENDS_${PN}-udevrules = "${PN}"
RDEPENDS_${PN}_append_class-target = " libdevmapper"
RDEPENDS_${PN}_append_class-nativesdk = " libdevmapper"
RDEPENDS_${PN}-scripts = "${PN} (= ${EXTENDPKGV}) bash"
RRECOMMENDS_${PN}_class-target = "${PN}-scripts (= ${EXTENDPKGV})"

14
meta-citadel/recipes-support/sassc/sassc_3.4.7.bb
View File

@ -1,14 +0,0 @@
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=2f8a76980411a3f1f1480b141ce06744"
SRC_URI = "https://github.com/sass/sassc/archive/${PV}.tar.gz;downloadfilename=${PN}-${PV}.tar.gz"
SRC_URI[md5sum] = "a3b975e21a6485643f836a9880b1128a"
SRC_URI[sha256sum] = "b3ff3c1741a133440d7ef59ba405d4289ceee36dfde2a49501a7c57d75649900"
DEPENDS = "libsass"
inherit autotools
EXTRA_OECONF = ""
BBCLASSEXTEND = "native"

15
meta-citadel/recipes-support/sassc/sassc_3.5.0.bb Normal file
View File

@ -0,0 +1,15 @@
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=2f8a76980411a3f1f1480b141ce06744"
SRC_URI = "git://github.com/sass/sassc.git;protocol=git"
SRCREV = "aa6d5c635ea8faf44d542a23aaf85d27e5777d48"
S = "${WORKDIR}/git"
DEPENDS = "libsass"
inherit autotools
EXTRA_OECONF = ""
BBCLASSEXTEND = "native"

4
meta-citadel/recipes-support/udisks/udisks2_2.7.7.bb → meta-citadel/recipes-support/udisks/udisks2_2.7.8.bb
View File

@ -19,10 +19,10 @@ DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
RDEPENDS_${PN} = "acl"
SRC_URI = " \
git://github.com/storaged-project/udisks.git \
git://github.com/storaged-project/udisks.git;branch=2.7.x-branch \
file://non-gnu-libc.patch \
"
SRCREV = "fcf888ca00980f75ce0c47041629b3d77e9f352e"
SRCREV = "47bc0141cb84624ba1e2242d596a89a30df1f5ea"
S = "${WORKDIR}/git"
CVE_PRODUCT = "udisks"

27
meta-citadel/recipes-support/vifm/vifm/0001-prefix-needed-for-ncurses-check.patch
View File

@ -1,27 +0,0 @@
From 71f747ad793aeab16ef49e38c241cfcb2b50ec79 Mon Sep 17 00:00:00 2001
From: brl <bruce@subgraph.com>
Date: Wed, 6 Dec 2017 20:42:29 -0500
Subject: [PATCH] prefix needed for ncurses check
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 09248d4..1e28505 100644
--- a/configure.ac
+++ b/configure.ac
@@ -414,8 +414,8 @@ ncurses_found=no
dnl Firstly check for lib${curses_lib_name}.
AC_CHECK_LIB(${curses_lib_name}, initscr,
[LIBS="$LIBS -l${curses_lib_name}"
- if test x$vifm_cv_curses = x/usr -a -d /usr/include/${curses_lib_name}; then
- CPPFLAGS="$CPPFLAGS -I/usr/include/${curses_lib_name}"
+ if test x$vifm_cv_curses = x/usr -a -d ${prefix}/usr/include/${curses_lib_name}; then
+ CPPFLAGS="$CPPFLAGS -I${prefix}/usr/include/${curses_lib_name}"
fi
ncurses_found=yes]
AC_SEARCH_LIBS([curs_set], [tinfo],,
--
2.14.3

21
meta-citadel/recipes-support/vifm/vifm_0.9.bb
View File

@ -1,21 +0,0 @@
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "https://github.com/vifm/vifm/releases/download/v${PV}/vifm-${PV}.tar.bz2 \
file://0001-prefix-needed-for-ncurses-check.patch \
"
SRC_URI[md5sum] = "a523a16a7a0170141b5a36cb67251490"
SRC_URI[sha256sum] = "ab10c99d1e4c24ff8a03c20be1c202cc15874750cc47a1614e6fe4f8d816a7fd"
DEPENDS = "file ncurses libx11 groff-native"
RDEPENDS_${PN} = "ncurses-terminfo"
FILES_${PN} += "\
${datadir}/bash-completion \
"
do_install_append() {
rm -rf ${D}${datadir}/zsh
}
inherit perlnative autotools

28
meta-citadel/recipes-support/vim/files/disable_acl_header_check.patch
View File

@ -1,14 +1,23 @@
Upstream-Status: pending
From 5ed25c076a1fb1889a3c50dddf29f21850b59a13 Mon Sep 17 00:00:00 2001
From: Wenzong Fan <wenzong.fan@windriver.com>
Date: Tue, 26 Jun 2018 17:29:09 +0800
Subject: [PATCH] disable acl header check
Don't check 'sys/acl.h' if acl support disabled for vim/vim-tiny.
Upstream-Status: pending
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
================================================
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
src/configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/configure.ac b/src/configure.ac
index fb965e5..d734064 100644
index 107c170..0ee86ad 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -2511,7 +2511,7 @@ AC_CHECK_HEADERS(stdarg.h stdint.h stdlib.h string.h \
@@ -3220,7 +3220,7 @@ AC_CHECK_HEADERS(stdint.h stdlib.h string.h \
sys/systeminfo.h locale.h sys/stream.h termios.h \
libc.h sys/statfs.h poll.h sys/poll.h pwd.h \
utime.h sys/param.h libintl.h libgen.h \
@ -17,11 +26,14 @@ index fb965e5..d734064 100644
sys/access.h sys/sysinfo.h wchar.h wctype.h)
dnl sys/ptem.h depends on sys/stream.h on Solaris
@@ -3112,6 +3112,7 @@ AC_ARG_ENABLE(acl,
@@ -3848,6 +3848,7 @@ AC_ARG_ENABLE(acl,
, [enable_acl="yes"])
if test "$enable_acl" = "yes"; then
AC_MSG_RESULT(no)
+AC_CHECK_HEADERS(sys/acl.h)
AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"],
AC_MSG_RESULT(no)
+ AC_CHECK_HEADERS(sys/acl.h)
AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"],
AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl"
AC_CHECK_LIB(attr, fgetxattr, LIBS="$LIBS -lattr",,)],,),)
--
2.7.4

16
meta-citadel/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch
View File

@ -1,20 +1,24 @@
vim: add knob whether elf.h are checked
From 38de4bccdb8a861ffdd447f12fdab19d6d852c02 Mon Sep 17 00:00:00 2001
From: Chong Lu <Chong.Lu@windriver.com>
Date: Tue, 26 Jun 2018 17:34:15 +0800
Subject: [PATCH] vim: add knob whether elf.h are checked
Previously, it still was checked when there was no elf library in sysroots directory.
Add knob to decide whether elf.h are checked or not.
Upstream-status: Pending
Upstream-Status: Pending
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
src/configure.ac | 7 +++++++
src/configure.ac | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/configure.ac b/src/configure.ac
index d734064..f504fa6 100644
index 0ee86ad..64736f0 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -2483,11 +2483,18 @@ AC_TRY_COMPILE([#include <stdio.h>], [int x __attribute__((unused));],
@@ -3192,11 +3192,18 @@ AC_TRY_COMPILE([#include <stdio.h>], [int x __attribute__((unused));],
AC_MSG_RESULT(no))
dnl Checks for header files.
@ -34,5 +38,5 @@ index d734064..f504fa6 100644
AC_HEADER_DIRENT
--
1.7.9.5
2.7.4

6
meta-citadel/recipes-support/vim/vim-tiny_8.0.0983.bb → meta-citadel/recipes-support/vim/vim-tiny_8.1.0347.bb
View File

@ -2,11 +2,13 @@ require vim_${PV}.bb
SUMMARY += " (with tiny features)"
PROVIDES_remove = "xxd"
ALTERNATIVE_${PN}_remove = "xxd"
PACKAGECONFIG += "tiny"
do_install() {
install -d ${D}/${bindir}
install -m 0755 ${S}/vim ${D}/${bindir}/vim.tiny
install -D -m 0755 ${S}/vim ${D}/${bindir}/vim.tiny
}
ALTERNATIVE_PRIORITY = "90"

19
meta-citadel/recipes-support/vim/vim_8.0.0983.bb → meta-citadel/recipes-support/vim/vim_8.1.0347.bb
View File

@ -1,23 +1,26 @@
SUMMARY = "Vi IMproved - enhanced vi editor"
SECTION = "console/utils"
PROVIDES = "xxd"
DEPENDS = "ncurses gettext-native"
# vimdiff doesn't like busybox diff
RSUGGESTS_${PN} = "diffutils"
LICENSE = "vim"
LIC_FILES_CHKSUM = "file://../runtime/doc/uganda.txt;md5=eea32ac1424bba14096736a494ae9045"
LIC_FILES_CHKSUM = "file://../runtime/doc/uganda.txt;endline=287;md5=f1f82b42360005c70b8c19b0ef493f72"
SRC_URI = "git://github.com/vim/vim.git \
file://disable_acl_header_check.patch;patchdir=.. \
file://vim-add-knob-whether-elf.h-are-checked.patch;patchdir=.. \
"
SRCREV = "3f9a1ff141412e9e85f7dff47d02946cb9be9228"
SRCREV = "f1c118be93184e8e57e3e80b1b3383f464ed649e"
S = "${WORKDIR}/git/src"
VIMDIR = "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}"
inherit autotools update-alternatives
inherit autotools-brokensep
inherit autotools-brokensep update-alternatives
CLEANBROKEN = "1"
# vim configure.in contains functions which got 'dropped' by autotools.bbclass
do_configure () {
@ -52,7 +55,7 @@ EXTRA_OECONF = " \
vim_cv_memmove_handles_overlap=yes \
vim_cv_stat_ignores_slash=no \
vim_cv_terminfo=yes \
vim_cv_tgent=non-zero \
vim_cv_tgetent=non-zero \
vim_cv_toupper_broken=no \
vim_cv_tty_group=world \
STRIP=/bin/true \
@ -103,10 +106,12 @@ RDEPENDS_${BPN} = "ncurses-terminfo-base"
# Recommend that runtime data is installed along with vim
RRECOMMENDS_${BPN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-common"
ALTERNATIVE_${PN} = "vi vim"
ALTERNATIVE_${PN} = "vi vim xxd"
ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE_TARGET = "${bindir}/${BPN}.${BPN}"
ALTERNATIVE_LINK_NAME[vi] = "${base_bindir}/vi"
ALTERNATIVE_LINK_NAME[vim] = "${bindir}/vim"
ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"
ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"
BBCLASSEXTEND = "native"

8
meta-citadel/recipes-support/volume-key/volume-key_0.3.11.bb → meta-citadel/recipes-support/volume-key/volume-key_0.3.12.bb
View File

@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "https://releases.pagure.org/volume_key/volume_key-${PV}.tar.xz \
"
SRC_URI[md5sum] = "30df56c7743eb7c965293b3d61194232"
SRC_URI[sha256sum] = "e6b279c25ae477b555f938db2e41818f90c8cde942b0eec92f70b6c772095f6d"
SRC_URI[md5sum] = "200591290173c3ea71528411838f9080"
SRC_URI[sha256sum] = "6ca3748fc1dad22c450bbf6601d4e706cb11c5e662d11bb4aeb473a9cd77309b"
SRCNAME = "volume_key"
S = "${WORKDIR}/${SRCNAME}-${PV}"
@ -27,6 +27,10 @@ DEPENDS += " \
swig-native \
"
PACKAGECONFIG ??= "python3"
PACKAGECONFIG[python] = "--with-python,--without-python,python,python"
PACKAGECONFIG[python3] = "--with-python3,--without-python3,python3,python3"
RDEPENDS_python3-${PN} += "${PN}"
PACKAGES += "python3-${PN}"

34
meta-citadel/recipes-support/wireguard-tools/wireguard-tools_0.0.20180613.bb
View File

@ -1,34 +0,0 @@
require wireguard-tools.inc
inherit bash-completion systemd pkgconfig
DEPENDS = "libmnl"
do_compile_prepend () {
cd ${S}/tools
}
do_unpack () {
tar -xvf ${DL_DIR}/WireGuard-0.0.20180613.tar.xz -C ${WORKDIR}/
# Remove symlink pointing to non-existent file as this causes the
# reproducible_build .bbclass to fail
rm ${WORKDIR}/WireGuard-0.0.20180613/src/tools/wg-quick/wg
}
do_install () {
cd ${S}/tools
oe_runmake DESTDIR="${D}" PREFIX="${prefix}" SYSCONFDIR="${sysconfdir}" \
SYSTEMDUNITDIR="${systemd_unitdir}" \
WITH_SYSTEMDUNITS=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'yes', '', d)} \
WITH_BASHCOMPLETION=yes \
WITH_WGQUICK=yes \
install
}
FILES_${PN} = " \
${sysconfdir} \
${systemd_unitdir} \
${bindir} \
"
RDEPENDS_${PN} = "bash"