From 00edc9e484860efe87607c94b5884e35f08ecb96 Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Thu, 10 Oct 2019 14:28:12 +0200 Subject: Dirty change to dnbd3-ng Signed-off-by: Thiago Abdo --- builder/build-initramfs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh index a59ebab0..d306cf30 100755 --- a/builder/build-initramfs.sh +++ b/builder/build-initramfs.sh @@ -45,7 +45,7 @@ if [ ! -e "$_repo_dir" ]; then branch="$(git config -f .gitmodules --get submodule.${mod}.branch)" commit="$(git submodule status $path | grep -oE '[0-9a-f]{40}')" depth_arg=("--shallow-since") - [ "$mod" = "dnbd3" ] && depth_arg+=("2019-02-12") + [ "$mod" = "dnbd3" ] && depth_arg+=("2019-02-12") && url="git://git.openslx.org/dnbd3-ng.git" [ "$mod" = "rebash" ] && depth_arg+=("2016-11-30") [ "$mod" = "qemu-xmount" ] && depth_arg+=("2016-01-01") [ "$mod" = "xmount" ] && depth_arg+=("2015-11-05") -- cgit v1.2.3-55-g7522 From 02500469bca2d4c00649b0813359bf24d7945e25 Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Thu, 10 Oct 2019 14:31:16 +0200 Subject: Patches to dnbd3-ng centos8 Signed-off-by: Thiago Abdo --- builder/patches/dnbd3/01-fix | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 builder/patches/dnbd3/01-fix diff --git a/builder/patches/dnbd3/01-fix b/builder/patches/dnbd3/01-fix new file mode 100644 index 00000000..e31e4c77 --- /dev/null +++ b/builder/patches/dnbd3/01-fix @@ -0,0 +1,34 @@ +diff --git a/src/kernel/mq.c b/src/kernel/mq.c +index 5fa34d5..d83f7e4 100644 +--- a/src/kernel/mq.c ++++ b/src/kernel/mq.c +@@ -49,7 +49,7 @@ unsigned long dnbd3_is_mq_busy(struct dnbd3_device *dev) + struct blk_mq_tag_set *set = &dev->tag_set; + unsigned long busy = 0; + +- blk_mq_tagset_busy_iter(set, dnbd3_busy_iter, &busy); ++ blk_mq_tagset_busy_iter(set, (busy_tag_iter_fn *)dnbd3_busy_iter, &busy); + + /* + * just for demonstration +@@ -86,7 +86,7 @@ static void dnbd3_busy_iter_requeue(struct request *req, void *priv, bool arg) + void dndb3_reque_busy_requests(struct dnbd3_sock *sock) + { + struct blk_mq_tag_set *set = &sock->device->tag_set; +- blk_mq_tagset_busy_iter(set, dnbd3_busy_iter_requeue, sock); ++ blk_mq_tagset_busy_iter(set,(busy_tag_iter_fn *) dnbd3_busy_iter_requeue, sock); + } + + +diff --git a/src/kernel/net-txrx.c b/src/kernel/net-txrx.c +index 3d2cc7c..a0d75bb 100644 +--- a/src/kernel/net-txrx.c ++++ b/src/kernel/net-txrx.c +@@ -23,6 +23,7 @@ + #include "utils.h" + #include "clientconfig.h" + #include "mq.h" ++#include + + #include + -- cgit v1.2.3-55-g7522 From 654de68ba17a750032ba8b8c6f5fc0562a2c214b Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Thu, 10 Oct 2019 15:12:32 +0200 Subject: change default branch Signed-off-by: Thiago Abdo --- builder/build-initramfs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh index d306cf30..9cf0b641 100755 --- a/builder/build-initramfs.sh +++ b/builder/build-initramfs.sh @@ -24,7 +24,7 @@ declare -rg _root_dir="$(readlink -f $(dirname ${BASH_SOURCE[0]}))" declare -rg _repo_dir="${_root_dir}/systemd-init.git" declare -rg _git_source="git://git.openslx.org/openslx-ng/systemd-init.git" -declare -rg _git_branch="master" +declare -rg _git_branch="centos8" ## region ensure presence of needed dependencies set -o errexit if [ ! -e "$_repo_dir" ]; then @@ -45,7 +45,7 @@ if [ ! -e "$_repo_dir" ]; then branch="$(git config -f .gitmodules --get submodule.${mod}.branch)" commit="$(git submodule status $path | grep -oE '[0-9a-f]{40}')" depth_arg=("--shallow-since") - [ "$mod" = "dnbd3" ] && depth_arg+=("2019-02-12") && url="git://git.openslx.org/dnbd3-ng.git" + [ "$mod" = "dnbd3" ] && depth_arg+=("2019-02-12") && url="git://git.openslx.org/dnbd3-ng.git" && commit="a6ddfe1212a2df72cacb0f44cc872b1bd0363c38" [ "$mod" = "rebash" ] && depth_arg+=("2016-11-30") [ "$mod" = "qemu-xmount" ] && depth_arg+=("2016-01-01") [ "$mod" = "xmount" ] && depth_arg+=("2015-11-05") -- cgit v1.2.3-55-g7522 From 8e1151400cd90288a1d1d9781aa00887a32c3457 Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Thu, 10 Oct 2019 15:37:11 +0200 Subject: fix fix Signed-off-by: Thiago Abdo --- builder/patches/dnbd3/01-fix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/builder/patches/dnbd3/01-fix b/builder/patches/dnbd3/01-fix index e31e4c77..ee4b190b 100644 --- a/builder/patches/dnbd3/01-fix +++ b/builder/patches/dnbd3/01-fix @@ -3,20 +3,20 @@ index 5fa34d5..d83f7e4 100644 --- a/src/kernel/mq.c +++ b/src/kernel/mq.c @@ -49,7 +49,7 @@ unsigned long dnbd3_is_mq_busy(struct dnbd3_device *dev) - struct blk_mq_tag_set *set = &dev->tag_set; - unsigned long busy = 0; + struct blk_mq_tag_set *set = &dev->tag_set; + unsigned long busy = 0; -- blk_mq_tagset_busy_iter(set, dnbd3_busy_iter, &busy); -+ blk_mq_tagset_busy_iter(set, (busy_tag_iter_fn *)dnbd3_busy_iter, &busy); +- blk_mq_tagset_busy_iter(set, dnbd3_busy_iter, &busy); ++ blk_mq_tagset_busy_iter(set, (busy_tag_iter_fn *)dnbd3_busy_iter, &busy); - /* - * just for demonstration + /* + * just for demonstration @@ -86,7 +86,7 @@ static void dnbd3_busy_iter_requeue(struct request *req, void *priv, bool arg) void dndb3_reque_busy_requests(struct dnbd3_sock *sock) { - struct blk_mq_tag_set *set = &sock->device->tag_set; -- blk_mq_tagset_busy_iter(set, dnbd3_busy_iter_requeue, sock); -+ blk_mq_tagset_busy_iter(set,(busy_tag_iter_fn *) dnbd3_busy_iter_requeue, sock); + struct blk_mq_tag_set *set = &sock->device->tag_set; +- blk_mq_tagset_busy_iter(set, dnbd3_busy_iter_requeue, sock); ++ blk_mq_tagset_busy_iter(set,(busy_tag_iter_fn *) dnbd3_busy_iter_requeue, sock); } -- cgit v1.2.3-55-g7522 From 2fb14d255bcf988e72bb46d2e822adf0aa2995c3 Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Thu, 10 Oct 2019 16:19:54 +0200 Subject: quick fix patch Signed-off-by: Thiago Abdo --- builder/patches/dnbd3/01-fix | 34 ---------------------------------- builder/patches/dnbd3/01-fix.patch | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 builder/patches/dnbd3/01-fix create mode 100644 builder/patches/dnbd3/01-fix.patch diff --git a/builder/patches/dnbd3/01-fix b/builder/patches/dnbd3/01-fix deleted file mode 100644 index ee4b190b..00000000 --- a/builder/patches/dnbd3/01-fix +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/src/kernel/mq.c b/src/kernel/mq.c -index 5fa34d5..d83f7e4 100644 ---- a/src/kernel/mq.c -+++ b/src/kernel/mq.c -@@ -49,7 +49,7 @@ unsigned long dnbd3_is_mq_busy(struct dnbd3_device *dev) - struct blk_mq_tag_set *set = &dev->tag_set; - unsigned long busy = 0; - -- blk_mq_tagset_busy_iter(set, dnbd3_busy_iter, &busy); -+ blk_mq_tagset_busy_iter(set, (busy_tag_iter_fn *)dnbd3_busy_iter, &busy); - - /* - * just for demonstration -@@ -86,7 +86,7 @@ static void dnbd3_busy_iter_requeue(struct request *req, void *priv, bool arg) - void dndb3_reque_busy_requests(struct dnbd3_sock *sock) - { - struct blk_mq_tag_set *set = &sock->device->tag_set; -- blk_mq_tagset_busy_iter(set, dnbd3_busy_iter_requeue, sock); -+ blk_mq_tagset_busy_iter(set,(busy_tag_iter_fn *) dnbd3_busy_iter_requeue, sock); - } - - -diff --git a/src/kernel/net-txrx.c b/src/kernel/net-txrx.c -index 3d2cc7c..a0d75bb 100644 ---- a/src/kernel/net-txrx.c -+++ b/src/kernel/net-txrx.c -@@ -23,6 +23,7 @@ - #include "utils.h" - #include "clientconfig.h" - #include "mq.h" -+#include - - #include - diff --git a/builder/patches/dnbd3/01-fix.patch b/builder/patches/dnbd3/01-fix.patch new file mode 100644 index 00000000..ee4b190b --- /dev/null +++ b/builder/patches/dnbd3/01-fix.patch @@ -0,0 +1,34 @@ +diff --git a/src/kernel/mq.c b/src/kernel/mq.c +index 5fa34d5..d83f7e4 100644 +--- a/src/kernel/mq.c ++++ b/src/kernel/mq.c +@@ -49,7 +49,7 @@ unsigned long dnbd3_is_mq_busy(struct dnbd3_device *dev) + struct blk_mq_tag_set *set = &dev->tag_set; + unsigned long busy = 0; + +- blk_mq_tagset_busy_iter(set, dnbd3_busy_iter, &busy); ++ blk_mq_tagset_busy_iter(set, (busy_tag_iter_fn *)dnbd3_busy_iter, &busy); + + /* + * just for demonstration +@@ -86,7 +86,7 @@ static void dnbd3_busy_iter_requeue(struct request *req, void *priv, bool arg) + void dndb3_reque_busy_requests(struct dnbd3_sock *sock) + { + struct blk_mq_tag_set *set = &sock->device->tag_set; +- blk_mq_tagset_busy_iter(set, dnbd3_busy_iter_requeue, sock); ++ blk_mq_tagset_busy_iter(set,(busy_tag_iter_fn *) dnbd3_busy_iter_requeue, sock); + } + + +diff --git a/src/kernel/net-txrx.c b/src/kernel/net-txrx.c +index 3d2cc7c..a0d75bb 100644 +--- a/src/kernel/net-txrx.c ++++ b/src/kernel/net-txrx.c +@@ -23,6 +23,7 @@ + #include "utils.h" + #include "clientconfig.h" + #include "mq.h" ++#include + + #include + -- cgit v1.2.3-55-g7522 From 08402848c9f98cfd4ff7074359198350f99adf78 Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Mon, 14 Oct 2019 10:16:24 +0200 Subject: fix loop modules count(centos8) Signed-off-by: Thiago Abdo --- builder/modules.d/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builder/modules.d/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh b/builder/modules.d/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh index 8e7b1a7d..86116098 100755 --- a/builder/modules.d/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh +++ b/builder/modules.d/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh @@ -9,10 +9,10 @@ type emergency_shell >/dev/null 2>&1 || source /lib/dracut-lib.sh exceptions.try { for kmod in dnbd3 \ - loop \ + "loop max_loop=8" \ loop_file_fmt_qcow \ loop_file_fmt_raw; do - if ! modprobe "${kmod}"; then + if ! modprobe ${kmod}; then logging.warn "Failed to load kernel module: $kmod" ! : fi -- cgit v1.2.3-55-g7522 From 05d334b707696835f633a05f6f188b9711e9f687 Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Tue, 15 Oct 2019 13:14:41 +0200 Subject: Changes branch of kernel-qcow2-linux Signed-off-by: Thiago Abdo --- builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux b/builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux index f9b4646c..4f7e7466 160000 --- a/builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux +++ b/builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux @@ -1 +1 @@ -Subproject commit f9b4646c47caf5c123a32d24cf3d84bb2928771b +Subproject commit 4f7e7466ad6b3c52b4ce4ea0c35fbea02de04bc5 -- cgit v1.2.3-55-g7522 From 78d9290b87c8ff26d6b40db239b5fe96a59b78e8 Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Tue, 15 Oct 2019 13:24:40 +0200 Subject: change branch of kernel-qcow2-linux Signed-off-by: Thiago Abdo --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index ef581865..8ed1b2dc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,7 +4,7 @@ branch = master [submodule "dnbd3"] path = builder/modules.d/dnbd3-rootfs/binaries/dnbd3 - url = git://git.openslx.org/dnbd3.git + url = git://git.openslx.org/dnbd3-ng.git branch = master [submodule "xmount"] path = builder/modules.d/dnbd3-rootfs/binaries/xmount @@ -21,4 +21,4 @@ [submodule "kernel-qcow2-linux"] path = builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux url = git://git.openslx.org/openslx/kernel-qcow2-linux.git - branch = kernel-qcow2-linux-4.19.y + branch=kernel-qcow2-linux-4.18.x-centos -- cgit v1.2.3-55-g7522 From 33149f1971ba6b055b87d52c0a7fc04142d46bb5 Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Tue, 15 Oct 2019 13:29:25 +0200 Subject: Upgrade commit of kernel-qcow2-linux Signed-off-by: Thiago Abdo --- builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux b/builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux index 4f7e7466..0761b3e9 160000 --- a/builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux +++ b/builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux @@ -1 +1 @@ -Subproject commit 4f7e7466ad6b3c52b4ce4ea0c35fbea02de04bc5 +Subproject commit 0761b3e9e03ed63b4adfd8b4a82f334352729a44 -- cgit v1.2.3-55-g7522 From a1a1bda3b5927b5bf825e1b179db267a0cb3ce3c Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Tue, 15 Oct 2019 13:45:21 +0200 Subject: Changes the compiling of losetup to compily with static libraries and shared gcc Signed-off-by: Thiago Abdo --- builder/modules.d/dnbd3-rootfs/helper/build.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/builder/modules.d/dnbd3-rootfs/helper/build.inc b/builder/modules.d/dnbd3-rootfs/helper/build.inc index 3a0cd5a3..ab5418d4 100644 --- a/builder/modules.d/dnbd3-rootfs/helper/build.inc +++ b/builder/modules.d/dnbd3-rootfs/helper/build.inc @@ -248,6 +248,7 @@ build_compile_losetup_qcow() { ./autogen.sh ./configure make -j losetup + gcc -I./libsmartcols/src -O2 -o .libs/losetup sys-utils/losetup-losetup.o .libs/libcommon.a .libs/libsmartcols.a ) local ret=$? popd -- cgit v1.2.3-55-g7522 From 0bbbf1f2ffddde6e4cf81bb768c7176dcb7f722e Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Tue, 15 Oct 2019 14:13:58 +0200 Subject: use full dinamicly linked losetup Signed-off-by: Thiago Abdo --- builder/modules.d/dnbd3-rootfs/helper/build.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/builder/modules.d/dnbd3-rootfs/helper/build.inc b/builder/modules.d/dnbd3-rootfs/helper/build.inc index ab5418d4..3a0cd5a3 100644 --- a/builder/modules.d/dnbd3-rootfs/helper/build.inc +++ b/builder/modules.d/dnbd3-rootfs/helper/build.inc @@ -248,7 +248,6 @@ build_compile_losetup_qcow() { ./autogen.sh ./configure make -j losetup - gcc -I./libsmartcols/src -O2 -o .libs/losetup sys-utils/losetup-losetup.o .libs/libcommon.a .libs/libsmartcols.a ) local ret=$? popd -- cgit v1.2.3-55-g7522 From 254ca4a14bf5c9054fdaaa871b89bd87735bbb15 Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Tue, 15 Oct 2019 15:28:28 +0200 Subject: add path to prepare-root Signed-off-by: Thiago Abdo --- builder/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/builder/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh b/builder/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh index 619226f5..8b5343cc 100755 --- a/builder/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh +++ b/builder/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh @@ -3,6 +3,12 @@ type emergency_shell > /dev/null 2>&1 || source /lib/dracut-lib.sh source /etc/openslx source '/usr/lib/rebash/core.sh' + +export PATH="/usr/local/bin:$PATH" + +# quick fix, this must not be here! +export LD_LIBRARY_PATH="/usr/local/lib" + core.import exceptions core.import logging # endregion -- cgit v1.2.3-55-g7522 From 78bd4c12d63e9116253449b60a10e9c812891c4b Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Tue, 15 Oct 2019 16:00:53 +0200 Subject: Revert "use full dinamicly linked losetup" This reverts commit 0bbbf1f2ffddde6e4cf81bb768c7176dcb7f722e. --- builder/modules.d/dnbd3-rootfs/helper/build.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/builder/modules.d/dnbd3-rootfs/helper/build.inc b/builder/modules.d/dnbd3-rootfs/helper/build.inc index 3a0cd5a3..ab5418d4 100644 --- a/builder/modules.d/dnbd3-rootfs/helper/build.inc +++ b/builder/modules.d/dnbd3-rootfs/helper/build.inc @@ -248,6 +248,7 @@ build_compile_losetup_qcow() { ./autogen.sh ./configure make -j losetup + gcc -I./libsmartcols/src -O2 -o .libs/losetup sys-utils/losetup-losetup.o .libs/libcommon.a .libs/libsmartcols.a ) local ret=$? popd -- cgit v1.2.3-55-g7522 From 3eff3fcd9db6ac10e7df8f76f75c5d14e5e66568 Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Tue, 15 Oct 2019 17:05:20 +0200 Subject: Removes logging configuration from exception, probabily in bash 4.4.19 they does not work Signed-off-by: Thiago Abdo --- .../dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh | 6 +++--- builder/modules.d/dnbd3-rootfs/hooks/mount-root-device.sh | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/builder/modules.d/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh b/builder/modules.d/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh index 12dab27d..bb8feccc 100755 --- a/builder/modules.d/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh +++ b/builder/modules.d/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh @@ -6,13 +6,13 @@ core.import exceptions core.import logging type emergency_shell >/dev/null 2>&1 || source /lib/dracut-lib.sh # endregion -exceptions.try -{ -source "/etc/openslx" logging.set_commands_level debug logging.set_level debug [[ "$SLX_LOG_FILE_PATH" == "" ]] && SLX_LOG_FILE_PATH=/var/log/openslx logging.set_log_file "$SLX_LOG_FILE_PATH" +exceptions.try +{ +source "/etc/openslx" mkdir --parents "${NEWROOT}/opt/openslx" cp "/etc/openslx" "${NEWROOT}/opt/openslx/config" diff --git a/builder/modules.d/dnbd3-rootfs/hooks/mount-root-device.sh b/builder/modules.d/dnbd3-rootfs/hooks/mount-root-device.sh index a5aceab6..36e4f091 100755 --- a/builder/modules.d/dnbd3-rootfs/hooks/mount-root-device.sh +++ b/builder/modules.d/dnbd3-rootfs/hooks/mount-root-device.sh @@ -1,17 +1,19 @@ #!/usr/bin/env bash # -*- coding: utf-8 -*- # region imports + +sleep 10 source '/usr/lib/rebash/core.sh' core.import exceptions type emergency_shell >/dev/null 2>&1 || source /lib/dracut-lib.sh # endregion -exceptions.try -{ logging.set_commands_level debug logging.set_level debug [[ "$SLX_LOG_FILE_PATH" == "" ]] && SLX_LOG_FILE_PATH=/var/log/openslx logging.set_log_file "$SLX_LOG_FILE_PATH" +exceptions.try +{ if ! getarg root=; then source "/etc/openslx" mount "$SLX_DNBD3_DEVICE_COW" "$NEWROOT" $SLX_MOUNT_ROOT_OPTIONS -- cgit v1.2.3-55-g7522 From 7c8ed51501549f6ceec84e6e67a3e606f7155a73 Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Mon, 4 Nov 2019 10:45:07 +0100 Subject: Fix commit reference of dnbd3-ng submodule Signed-off-by: Thiago Abdo --- builder/modules.d/dnbd3-rootfs/binaries/dnbd3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/modules.d/dnbd3-rootfs/binaries/dnbd3 b/builder/modules.d/dnbd3-rootfs/binaries/dnbd3 index c881c79f..a6ddfe12 160000 --- a/builder/modules.d/dnbd3-rootfs/binaries/dnbd3 +++ b/builder/modules.d/dnbd3-rootfs/binaries/dnbd3 @@ -1 +1 @@ -Subproject commit c881c79f31efb0ec401549494fc13a91136cf43c +Subproject commit a6ddfe1212a2df72cacb0f44cc872b1bd0363c38 -- cgit v1.2.3-55-g7522 From 8d6400b9eb3991f96edc6543bd2ff1c8090c7ee6 Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Mon, 11 Nov 2019 11:14:57 +0100 Subject: Update dnbd3-ng Signed-off-by: Thiago Abdo --- builder/build-initramfs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh index 01d08059..7ab65db7 100755 --- a/builder/build-initramfs.sh +++ b/builder/build-initramfs.sh @@ -38,7 +38,7 @@ if [ ! -e "$_repo_dir" ]; then branch="$(git config -f .gitmodules --get submodule.${mod}.branch)" commit="$(git submodule status $path | grep -oE '[0-9a-f]{40}')" depth_arg=("--shallow-since") - [ "$mod" = "dnbd3" ] && depth_arg+=("2019-02-12") && url="git://git.openslx.org/dnbd3-ng.git" && commit="a6ddfe1212a2df72cacb0f44cc872b1bd0363c38" + [ "$mod" = "dnbd3" ] && depth_arg+=("2019-02-12") && url="git://git.openslx.org/dnbd3-ng.git" && commit="b57dadc2dd577fb8ce21975722cdfa2f010cd718" [ "$mod" = "rebash" ] && depth_arg+=("2016-11-30") [ "$mod" = "qemu-xmount" ] && depth_arg+=("2016-01-01") [ "$mod" = "xmount" ] && depth_arg+=("2015-11-05") -- cgit v1.2.3-55-g7522 From f7cef40bef62ad079ac4c248fd33e9574bf5a055 Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Mon, 11 Nov 2019 11:26:02 +0100 Subject: Removed patch of dnbd3-ng because it was applyed at source Signed-off-by: Thiago Abdo --- builder/patches/dnbd3/01-fix.patch | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 builder/patches/dnbd3/01-fix.patch diff --git a/builder/patches/dnbd3/01-fix.patch b/builder/patches/dnbd3/01-fix.patch deleted file mode 100644 index ee4b190b..00000000 --- a/builder/patches/dnbd3/01-fix.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/src/kernel/mq.c b/src/kernel/mq.c -index 5fa34d5..d83f7e4 100644 ---- a/src/kernel/mq.c -+++ b/src/kernel/mq.c -@@ -49,7 +49,7 @@ unsigned long dnbd3_is_mq_busy(struct dnbd3_device *dev) - struct blk_mq_tag_set *set = &dev->tag_set; - unsigned long busy = 0; - -- blk_mq_tagset_busy_iter(set, dnbd3_busy_iter, &busy); -+ blk_mq_tagset_busy_iter(set, (busy_tag_iter_fn *)dnbd3_busy_iter, &busy); - - /* - * just for demonstration -@@ -86,7 +86,7 @@ static void dnbd3_busy_iter_requeue(struct request *req, void *priv, bool arg) - void dndb3_reque_busy_requests(struct dnbd3_sock *sock) - { - struct blk_mq_tag_set *set = &sock->device->tag_set; -- blk_mq_tagset_busy_iter(set, dnbd3_busy_iter_requeue, sock); -+ blk_mq_tagset_busy_iter(set,(busy_tag_iter_fn *) dnbd3_busy_iter_requeue, sock); - } - - -diff --git a/src/kernel/net-txrx.c b/src/kernel/net-txrx.c -index 3d2cc7c..a0d75bb 100644 ---- a/src/kernel/net-txrx.c -+++ b/src/kernel/net-txrx.c -@@ -23,6 +23,7 @@ - #include "utils.h" - #include "clientconfig.h" - #include "mq.h" -+#include - - #include - -- cgit v1.2.3-55-g7522 From 3c92f3e96506e24d27ef139e8887bc27a05959ce Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Tue, 19 Nov 2019 13:45:52 +0100 Subject: Update dnbd3-ng version Signed-off-by: Thiago Abdo --- builder/build-initramfs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh index 7ab65db7..e8afeb5a 100755 --- a/builder/build-initramfs.sh +++ b/builder/build-initramfs.sh @@ -38,7 +38,7 @@ if [ ! -e "$_repo_dir" ]; then branch="$(git config -f .gitmodules --get submodule.${mod}.branch)" commit="$(git submodule status $path | grep -oE '[0-9a-f]{40}')" depth_arg=("--shallow-since") - [ "$mod" = "dnbd3" ] && depth_arg+=("2019-02-12") && url="git://git.openslx.org/dnbd3-ng.git" && commit="b57dadc2dd577fb8ce21975722cdfa2f010cd718" + [ "$mod" = "dnbd3" ] && depth_arg+=("2019-02-12") && url="git://git.openslx.org/dnbd3-ng.git" && commit="fff87d1c3e19c0a24a3b0d4cff3e9a8f6f140e34" [ "$mod" = "rebash" ] && depth_arg+=("2016-11-30") [ "$mod" = "qemu-xmount" ] && depth_arg+=("2016-01-01") [ "$mod" = "xmount" ] && depth_arg+=("2015-11-05") -- cgit v1.2.3-55-g7522