From 99eb19344824eaac5173459ac810d9efb8b79a53b31296be0008ed2038596366 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Wed, 22 Jan 2020 11:17:28 +0000 Subject: [PATCH 1/3] Accepting request 766263 from home:cyphar:lxc - Update to LXD 3.19. The full upstream changelog is available from: https://discuss.linuxcontainers.org/t/lxd-3-19-has-been-released/6529 + Virtual machine support + Reworked storage layer + Routed networking mode + Custom mount options for disk devices + Interception of the mount system call + Multi-architecture clustering + ... OBS-URL: https://build.opensuse.org/request/show/766263 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/lxd?expand=0&rev=33 --- lxd-3.18.tar.gz | 3 --- lxd-3.18.tar.gz.asc | 16 ---------------- lxd-3.19.tar.gz | 3 +++ lxd-3.19.tar.gz.asc | 16 ++++++++++++++++ lxd.changes | 14 ++++++++++++++ lxd.spec | 26 ++++++++++++++++++++------ 6 files changed, 53 insertions(+), 25 deletions(-) delete mode 100644 lxd-3.18.tar.gz delete mode 100644 lxd-3.18.tar.gz.asc create mode 100644 lxd-3.19.tar.gz create mode 100644 lxd-3.19.tar.gz.asc diff --git a/lxd-3.18.tar.gz b/lxd-3.18.tar.gz deleted file mode 100644 index e524621..0000000 --- a/lxd-3.18.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b09434e089776fb0c48d384a6e04707ba1d99d60b7b59e8ba573d8c7d7130fdd -size 23590879 diff --git a/lxd-3.18.tar.gz.asc b/lxd-3.18.tar.gz.asc deleted file mode 100644 index 87d1854..0000000 --- a/lxd-3.18.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEYC9WdmPlk7y9FPM4xjiXTWR5LWcFAl2U0kMACgkQxjiXTWR5 -LWc8NRAAqT+2Vn6F1tenvD4En2HOhG3sVA3GVttjElMs9tpK7gafoXVMKBRH2Gem -GlqDYEKQz0IfzGZIBpwvHX0un7xt5A84NLcB0UDCE5Po23T577kbH7qsgrGup4Dk -kOmZ2LxUknb9IqCW66LbpaIJ31CY7f11lnVyOiGMI0nGTpgXvDGsbJyBt0B0jk96 -YzHchDCg+EctbrRzgRlLiKnW4HU3Idesud9MMOXKSTu1d8Y4IThoAR0ZXMDfX3f2 -hu+pU9idL5AFV5+gKfJF0lAbQsfjztZcvReK/L27EI5B7dYPOSe9GCnsY6xvBDKV -Z1MAZdiFY/hvP5zPVLcVSJ4M8sX6xF9HIy++JFF+T11Re3knTpmq0kes8WEZezRN -TYX7MNmEX3glRqvQhNr2nyDkXWA9Z+6Lks3Wrl3peC0/6Qm9g8yhSWMkqGG8o/1S -nU1qdZdMrs7IoKFkb/wulHSkeXzQsy6qp7FlBPWeSRH9AgFFhy16GibPcgz8Tru7 -wu5mYn292CSaidxijwseIjobpfy5hyCxb+X8VQYjXi4gVBNfsnVPJjlQIVbcv+iO -+Rxd3cdkl2zc+j8dtskQ7hgXrKDJG+QWszArxO+r9ipwiI4af57jRfKNtmmovHnQ -7uIyLauEhIPVdyllYh+DlmMeEx/xMebsPEhCSFT/CKIRfUjv5/E= -=3zIp ------END PGP SIGNATURE----- diff --git a/lxd-3.19.tar.gz b/lxd-3.19.tar.gz new file mode 100644 index 0000000..ca0b2fa --- /dev/null +++ b/lxd-3.19.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afc0b0912e5fa977007cfd97805849a3a47564eaaaa1638948081665ad7224c8 +size 24468419 diff --git a/lxd-3.19.tar.gz.asc b/lxd-3.19.tar.gz.asc new file mode 100644 index 0000000..3f2e9c4 --- /dev/null +++ b/lxd-3.19.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEYC9WdmPlk7y9FPM4xjiXTWR5LWcFAl4fh4MACgkQxjiXTWR5 +LWddlQ/+PD9UFJYmDCWuEIvLb5tGoKdrwOxTFItLvoL1+MpHtphRWFS8UArm6sS/ +ev7r8QTM9HMUCd+PbEEVYJ+tLbiEC4SJzG1en4Cfprl27BeSra9SQGzt/WdzGtZ7 +S2h3CvJrjHxOg0aBqBIIRPuvpETnpWFAXyALicf4KtuPimqPdFsDcOYAxtOQN2s/ +fVaZ8ibMNFcCGFn6PmXa0f3qiJfzKC1FsOEmVc4WpfU42g4tMZWJnFWsF5zRw+WC +gIA3CD5xHwrLfN0gg6tMbM/Aa1FWjBXcDHxP4uf2V6i8OxcIPzdfqf8auXbOkOwC +dtO3KZKFo1tJ2kwlhT7WaIOeHifFfRa3dybtyFGzpw50ZFjyGCjDK6T+i+FCZsOX +N9ergkzUqDw5GeYuxnjsSWT8bREZYw9RMpUfbM3d+UWQ2NFbNevCRMRcXDTlstO+ +4Jst6Yice7ohmfzOaeGgB+RTMnrBUZLp/5qpNiEKjOH+qDh8fE/IbcW+vNdco481 +jv0GJPJKg0XdWr0NkzMsuI6cjGkntWDwKQbtAOvRWJI3Q3Xg7PFZBu9Q7Q/oz6Q7 +G6WQvmQY4urFARLvjQgb3ZpsFwlJNMgeChzI2CQkfC8/Bl8Zvr/wVtaMx98yrVni +kjvJkp/G9eOOlEkB1IvCdJpwpz5vPdJhndJUcn/bv7ggTJlqlu4= +=XqkK +-----END PGP SIGNATURE----- diff --git a/lxd.changes b/lxd.changes index da2612f..9925eb1 100644 --- a/lxd.changes +++ b/lxd.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Jan 17 05:17:53 UTC 2020 - Aleksa Sarai + +- Update to LXD 3.19. The full upstream changelog is available from: + https://discuss.linuxcontainers.org/t/lxd-3-19-has-been-released/6529 + + Virtual machine support + + Reworked storage layer + + Routed networking mode + + Custom mount options for disk devices + + Interception of the mount system call + + Multi-architecture clustering + + ... +- Rework package handling to fake Go module builds. + ------------------------------------------------------------------- Wed Dec 11 23:55:40 UTC 2019 - Aleksa Sarai diff --git a/lxd.spec b/lxd.spec index f316a81..2ba1c85 100644 --- a/lxd.spec +++ b/lxd.spec @@ -1,7 +1,7 @@ # # spec file for package lxd # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ %define import_path github.com/lxc/lxd Name: lxd -Version: 3.18 +Version: 3.19 Release: 0 Summary: Container hypervisor based on LXC License: Apache-2.0 @@ -44,6 +44,7 @@ BuildRequires: libacl-devel BuildRequires: libcap-devel BuildRequires: patchelf BuildRequires: pkg-config +BuildRequires: rsync BuildRequires: golang(API) >= 1.10 BuildRequires: pkgconfig(lxc) >= 3.0.0 # Needed to build the sqlite fork and dqlite. @@ -96,6 +97,20 @@ fi # Move _dist/src (which is LXD's variant of vendoring) to vendor/. mv -v _dist/src vendor +# For some reason, some vendored packages have stored their vendored sources +# within their source tree inside the vendor tree (?!). So we need to +# workaround this, even though it's probably a bug in LXD packaging. +for vendor in $(find vendor/* -type d -name vendor) +do + rsync -a "$vendor/" vendor/ + rm -rf "$vendor/" +done + +# Create fake "go mod"-like import paths. This is going to be really fun to +# maintain but it's unfortunately necessary because openSUSE doesn't have nice +# "go mod" support in OBS... +ln -s . vendor/github.com/cpuguy83/go-md2man/v2 + %build # Make sure any leftover go build caches are gone. go clean -cache @@ -179,12 +194,11 @@ for mainpkg in "${mainpkgs[@]}" do binary="$(basename "$mainpkg")" ( - # We need to link against our dylib deps when dealing with lxd proper. - [ "$binary" == "lxd" ] && export \ - BUILDTAGS="libsqlite3" \ + # We need to link against our particular dylib deps. + export \ CGO_CFLAGS="-I $INSTALL_INCLUDEDIR" \ CGO_LDFLAGS="-L $INSTALL_LIBDIR" ||: - go build -buildmode=pie -tags "$BUILDTAGS" -o "bin/$binary" "$mainpkg" + go build -buildmode=pie -tags "libsqlite3" -o "bin/$binary" "$mainpkg" ) done From 3fc66afda62097dd1b8d8f9b826a57ce57fa0453a7dd2275edceaeb2a247f3fa Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Thu, 23 Jan 2020 04:52:42 +0000 Subject: [PATCH 2/3] Accepting request 766440 from home:cyphar:lxc Patch all binaries to avoid requires issues. OBS-URL: https://build.opensuse.org/request/show/766440 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/lxd?expand=0&rev=34 --- lxd.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lxd.spec b/lxd.spec index 2ba1c85..3812b38 100644 --- a/lxd.spec +++ b/lxd.spec @@ -248,7 +248,7 @@ done # Switch to absolute DT_NEEDED for all dylibs we have as well as the main LXD # binary. We do this for all dylibs to make sure we don't end up with weird # chain-loading problems. -for target in bin/lxd "$INSTALL_LIBDIR"/lib*.so +for target in bin/* "$INSTALL_LIBDIR"/lib*.so do # Drop RPATH in case it got included during builds. patchelf --remove-rpath "$target" @@ -270,6 +270,8 @@ for bin in * do # Ensure that all our binaries are dynamic. boo#1138769 file "$bin" | grep 'dynamically linked' + # Check what they are linked against. + ldd "$bin" done popd From 4cc30bbfc28e53e432843c65d8a98a415ccc0ed337ab2fcae9fe6ef4eb5bb29c Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Thu, 23 Jan 2020 05:13:28 +0000 Subject: [PATCH 3/3] Accepting request 766443 from home:cyphar:lxc Add boo#1161615 entry. OBS-URL: https://build.opensuse.org/request/show/766443 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/lxd?expand=0&rev=35 --- lxd.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/lxd.changes b/lxd.changes index 9925eb1..151864d 100644 --- a/lxd.changes +++ b/lxd.changes @@ -3,6 +3,7 @@ Fri Jan 17 05:17:53 UTC 2020 - Aleksa Sarai - Update to LXD 3.19. The full upstream changelog is available from: https://discuss.linuxcontainers.org/t/lxd-3-19-has-been-released/6529 + boo#1161615 + Virtual machine support + Reworked storage layer + Routed networking mode