* [PATCHv2 1/2] isar-apt: Mark repo as trusted in sources.list
@ 2018-05-24 15:26 Henning Schild
2018-05-24 15:26 ` [PATCHv2 2/2] conf: Add support for new debian distro "buster" Henning Schild
2018-05-24 15:31 ` [PATCHv2 1/2] isar-apt: Mark repo as trusted in sources.list Henning Schild
0 siblings, 2 replies; 10+ messages in thread
From: Henning Schild @ 2018-05-24 15:26 UTC (permalink / raw)
To: isar-users; +Cc: Alexander Smirnov, Henning Schild
Mark our own repository 'isar-apt' trusted in sources.list, and then
drop the '--allow-unauthenticated' switch we used for apt-get so far.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
meta/classes/isar-bootstrap-helper.bbclass | 5 ++---
meta/recipes-devtools/buildchroot/files/build.sh | 3 ---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/meta/classes/isar-bootstrap-helper.bbclass b/meta/classes/isar-bootstrap-helper.bbclass
index 4284d02..30f768c 100644
--- a/meta/classes/isar-bootstrap-helper.bbclass
+++ b/meta/classes/isar-bootstrap-helper.bbclass
@@ -11,15 +11,14 @@ setup_root_file_system() {
shift
shift
PACKAGES="$@"
- APT_ARGS="install --yes --allow-unauthenticated \
- -o Debug::pkgProblemResolver=yes"
+ APT_ARGS="install --yes -o Debug::pkgProblemResolver=yes"
CLEANHOSTLEAK_FILES="${ROOTFSDIR}/etc/hostname ${ROOTFSDIR}/etc/resolv.conf"
sudo cp -Trpfx \
"${DEPLOY_DIR_IMAGE}/isar-bootstrap-${DISTRO}-${DISTRO_ARCH}/" \
"$ROOTFSDIR"
- echo "deb file:///isar-apt ${DEBDISTRONAME} main" | \
+ echo "deb [trusted=yes] file:///isar-apt ${DEBDISTRONAME} main" | \
sudo tee "$ROOTFSDIR/etc/apt/sources.list.d/isar-apt.list" >/dev/null
echo "Package: *\nPin: release n=${DEBDISTRONAME}\nPin-Priority: 1000" | \
diff --git a/meta/recipes-devtools/buildchroot/files/build.sh b/meta/recipes-devtools/buildchroot/files/build.sh
index aa769e4..73c0889 100644
--- a/meta/recipes-devtools/buildchroot/files/build.sh
+++ b/meta/recipes-devtools/buildchroot/files/build.sh
@@ -20,9 +20,6 @@ export LANGUAGE=C
# 2) we add -y to go non-interactive
install_cmd="apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y"
-# Allow unauthenticated feeds
-install_cmd="${install_cmd} --allow-unauthenticated"
-
(
# Lock-protected because apt and dpkg do not wait in case of contention
flock 42 || exit 1
--
2.16.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCHv2 2/2] conf: Add support for new debian distro "buster"
2018-05-24 15:26 [PATCHv2 1/2] isar-apt: Mark repo as trusted in sources.list Henning Schild
@ 2018-05-24 15:26 ` Henning Schild
2018-05-27 19:54 ` Alexander Smirnov
2018-05-24 15:31 ` [PATCHv2 1/2] isar-apt: Mark repo as trusted in sources.list Henning Schild
1 sibling, 1 reply; 10+ messages in thread
From: Henning Schild @ 2018-05-24 15:26 UTC (permalink / raw)
To: isar-users; +Cc: Alexander Smirnov, Henning Schild
Let us already include support for "buster" in Isar, to prove that we
can build images and to find issues before it is declared stable.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
doc/user_manual.md | 2 +-
meta-isar/conf/distro/debian-buster.conf | 7 +++++++
meta-isar/conf/distro/debian-buster.list | 3 +++
meta-isar/conf/local.conf.sample | 4 ++++
meta-isar/conf/multiconfig/qemuamd64-buster.conf | 19 +++++++++++++++++++
meta-isar/conf/multiconfig/qemuarm-buster.conf | 18 ++++++++++++++++++
meta-isar/conf/multiconfig/qemuarm64-buster.conf | 18 ++++++++++++++++++
meta-isar/conf/multiconfig/qemui386-buster.conf | 20 ++++++++++++++++++++
scripts/ci_build.sh | 4 ++++
scripts/vm_smoke_test | 4 ++++
10 files changed, 98 insertions(+), 1 deletion(-)
create mode 100644 meta-isar/conf/distro/debian-buster.conf
create mode 100644 meta-isar/conf/distro/debian-buster.list
create mode 100644 meta-isar/conf/multiconfig/qemuamd64-buster.conf
create mode 100644 meta-isar/conf/multiconfig/qemuarm-buster.conf
create mode 100644 meta-isar/conf/multiconfig/qemuarm64-buster.conf
create mode 100644 meta-isar/conf/multiconfig/qemui386-buster.conf
diff --git a/doc/user_manual.md b/doc/user_manual.md
index a2f4b92..5bba720 100644
--- a/doc/user_manual.md
+++ b/doc/user_manual.md
@@ -53,7 +53,7 @@ Install the following packages:
```
dosfstools
git
-debootstrap
+debootstrap/jessie-backports# for debian >= "buster"
parted
python
qemu
diff --git a/meta-isar/conf/distro/debian-buster.conf b/meta-isar/conf/distro/debian-buster.conf
new file mode 100644
index 0000000..162257f
--- /dev/null
+++ b/meta-isar/conf/distro/debian-buster.conf
@@ -0,0 +1,7 @@
+# This software is a part of ISAR.
+
+DISTRO_APT_SOURCES += "conf/distro/debian-buster.list"
+DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
+DISTRO_KERNELS ?= "4kc-malta 586 5kc-malta 686 686-pae amd64 arm64 armmp \
+ armmp-lpae kirkwood loongson-3 marvell octeon orion5x powerpc64le \
+ rt-686-pae rt-amd64 s390x"
diff --git a/meta-isar/conf/distro/debian-buster.list b/meta-isar/conf/distro/debian-buster.list
new file mode 100644
index 0000000..18311d8
--- /dev/null
+++ b/meta-isar/conf/distro/debian-buster.list
@@ -0,0 +1,3 @@
+deb http://ftp.de.debian.org/debian buster main contrib non-free
+deb http://ftp.de.debian.org/debian buster-updates main contrib non-free
+deb http://security.debian.org buster/updates main contrib non-free
diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
index 390cc4c..a9fa6cb 100644
--- a/meta-isar/conf/local.conf.sample
+++ b/meta-isar/conf/local.conf.sample
@@ -41,11 +41,15 @@ BBMULTICONFIG = " \
qemuarm-wheezy \
qemuarm-jessie \
qemuarm-stretch \
+ qemuarm-buster \
qemuarm64-stretch \
+ qemuarm64-buster \
qemui386-jessie \
qemui386-stretch \
+ qemui386-buster \
qemuamd64-jessie \
qemuamd64-stretch \
+ qemuamd64-buster \
rpi-jessie \
"
diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
new file mode 100644
index 0000000..85404ae
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
@@ -0,0 +1,19 @@
+# This software is a part of ISAR.
+
+MACHINE ?= "qemuamd64"
+
+DISTRO ?= "debian-buster"
+DISTRO_ARCH ?= "amd64"
+
+KERNEL_NAME ?= "amd64"
+
+IMAGE_PREINSTALL += "init"
+
+IMAGE_TYPE ?= "wic-img"
+
+ROOTFS_DEV ?= "sda2"
+
+QEMU_ARCH ?= "x86_64"
+QEMU_MACHINE ?= "q35"
+QEMU_CPU ?= ""
+QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE## -bios /usr/local/share/ovmf/OVMF.fd"
diff --git a/meta-isar/conf/multiconfig/qemuarm-buster.conf b/meta-isar/conf/multiconfig/qemuarm-buster.conf
new file mode 100644
index 0000000..003f7c4
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemuarm-buster.conf
@@ -0,0 +1,18 @@
+# This software is a part of ISAR.
+
+MACHINE ?= "qemuarm"
+
+DISTRO ?= "debian-buster"
+DISTRO_ARCH ?= "armhf"
+
+KERNEL_NAME ?= "armmp"
+
+IMAGE_PREINSTALL += "init"
+
+ROOTFS_DEV ?= "vda"
+
+QEMU_ARCH ?= "arm"
+QEMU_MACHINE ?= "virt"
+QEMU_CPU ?= "cortex-a15"
+# TODO: start_vm doesn't support multiline vars
+QEMU_ROOTFS_DEV ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
diff --git a/meta-isar/conf/multiconfig/qemuarm64-buster.conf b/meta-isar/conf/multiconfig/qemuarm64-buster.conf
new file mode 100644
index 0000000..55ed421
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemuarm64-buster.conf
@@ -0,0 +1,18 @@
+# This software is a part of ISAR.
+
+MACHINE ?= "qemuarm64"
+
+DISTRO ?= "debian-buster"
+DISTRO_ARCH ?= "arm64"
+
+KERNEL_NAME ?= "arm64"
+
+IMAGE_PREINSTALL += "init"
+
+ROOTFS_DEV ?= "vda"
+
+QEMU_ARCH ?= "aarch64"
+QEMU_MACHINE ?= "virt"
+QEMU_CPU ?= "cortex-a57"
+# TODO: start_vm doesn't support multiline vars
+QEMU_ROOTFS_DEV ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
diff --git a/meta-isar/conf/multiconfig/qemui386-buster.conf b/meta-isar/conf/multiconfig/qemui386-buster.conf
new file mode 100644
index 0000000..e09cd0c
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemui386-buster.conf
@@ -0,0 +1,20 @@
+# This software is a part of ISAR.
+
+MACHINE ?= "qemui386"
+
+DISTRO ?= "debian-buster"
+DISTRO_ARCH ?= "i386"
+
+KERNEL_NAME ?= "686-pae"
+
+IMAGE_PREINSTALL += "init"
+
+IMAGE_TYPE ?= "wic-img"
+WKS_FILE ?= "directdisk-isar"
+
+ROOTFS_DEV ?= "sda2"
+
+QEMU_ARCH ?= "i386"
+QEMU_MACHINE ?= "pc"
+QEMU_CPU ?= ""
+QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE##"
diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
index fec0000..ce8ccc2 100755
--- a/scripts/ci_build.sh
+++ b/scripts/ci_build.sh
@@ -76,9 +76,13 @@ bitbake $BB_ARGS \
multiconfig:qemuarm-wheezy:isar-image-base \
multiconfig:qemuarm-jessie:isar-image-base \
multiconfig:qemuarm-stretch:isar-image-base \
+ multiconfig:qemuarm-buster:isar-image-base \
multiconfig:qemuarm64-stretch:isar-image-base \
+ multiconfig:qemuarm64-buster:isar-image-base \
multiconfig:qemui386-jessie:isar-image-base \
multiconfig:qemui386-stretch:isar-image-base \
+ multiconfig:qemui386-buster:isar-image-base \
multiconfig:qemuamd64-jessie:isar-image-base \
multiconfig:qemuamd64-stretch:isar-image-base \
+ multiconfig:qemuamd64-buster:isar-image-base \
multiconfig:rpi-jessie:isar-image-base
diff --git a/scripts/vm_smoke_test b/scripts/vm_smoke_test
index a88d127..2205df1 100755
--- a/scripts/vm_smoke_test
+++ b/scripts/vm_smoke_test
@@ -144,16 +144,20 @@ done
# ARM machine
run_test arm jessie
run_test arm stretch
+run_test arm buster
# AMD64 machine
run_test amd64 jessie
run_test amd64 stretch
+run_test amd64 buster
# i386 machine
run_test i386 jessie
run_test i386 stretch
+run_test i386 buster
# ARM64 machine
run_test arm64 stretch
+run_test arm64 buster
exit $RET
--
2.16.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCHv2 1/2] isar-apt: Mark repo as trusted in sources.list
2018-05-24 15:26 [PATCHv2 1/2] isar-apt: Mark repo as trusted in sources.list Henning Schild
2018-05-24 15:26 ` [PATCHv2 2/2] conf: Add support for new debian distro "buster" Henning Schild
@ 2018-05-24 15:31 ` Henning Schild
2018-06-01 15:52 ` Maxim Yu. Osipov
1 sibling, 1 reply; 10+ messages in thread
From: Henning Schild @ 2018-05-24 15:31 UTC (permalink / raw)
To: isar-users; +Cc: Alexander Smirnov
This first patch was missing in v1. Note this might collide with stuff
that Claudius has in the queue. Please merge if needed.
The second patch was just rebased and the buster images in v2 use wic.
Henning
Am Thu, 24 May 2018 17:26:51 +0200
schrieb Henning Schild <henning.schild@siemens.com>:
> Mark our own repository 'isar-apt' trusted in sources.list, and then
> drop the '--allow-unauthenticated' switch we used for apt-get so far.
>
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
> meta/classes/isar-bootstrap-helper.bbclass | 5 ++---
> meta/recipes-devtools/buildchroot/files/build.sh | 3 ---
> 2 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/meta/classes/isar-bootstrap-helper.bbclass
> b/meta/classes/isar-bootstrap-helper.bbclass index 4284d02..30f768c
> 100644 --- a/meta/classes/isar-bootstrap-helper.bbclass
> +++ b/meta/classes/isar-bootstrap-helper.bbclass
> @@ -11,15 +11,14 @@ setup_root_file_system() {
> shift
> shift
> PACKAGES="$@"
> - APT_ARGS="install --yes --allow-unauthenticated \
> - -o Debug::pkgProblemResolver=yes"
> + APT_ARGS="install --yes -o Debug::pkgProblemResolver=yes"
> CLEANHOSTLEAK_FILES="${ROOTFSDIR}/etc/hostname
> ${ROOTFSDIR}/etc/resolv.conf"
> sudo cp -Trpfx \
> "${DEPLOY_DIR_IMAGE}/isar-bootstrap-${DISTRO}-${DISTRO_ARCH}/"
> \ "$ROOTFSDIR"
>
> - echo "deb file:///isar-apt ${DEBDISTRONAME} main" | \
> + echo "deb [trusted=yes] file:///isar-apt ${DEBDISTRONAME} main"
> | \ sudo tee "$ROOTFSDIR/etc/apt/sources.list.d/isar-apt.list"
> >/dev/null
> echo "Package: *\nPin: release n=${DEBDISTRONAME}\nPin-Priority:
> 1000" | \ diff --git
> a/meta/recipes-devtools/buildchroot/files/build.sh
> b/meta/recipes-devtools/buildchroot/files/build.sh index
> aa769e4..73c0889 100644 ---
> a/meta/recipes-devtools/buildchroot/files/build.sh +++
> b/meta/recipes-devtools/buildchroot/files/build.sh @@ -20,9 +20,6 @@
> export LANGUAGE=C # 2) we add -y to go non-interactive
> install_cmd="apt-get -o Debug::pkgProblemResolver=yes
> --no-install-recommends -y" -# Allow unauthenticated feeds
> -install_cmd="${install_cmd} --allow-unauthenticated"
> -
> (
> # Lock-protected because apt and dpkg do not wait in case of
> contention flock 42 || exit 1
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCHv2 2/2] conf: Add support for new debian distro "buster"
2018-05-24 15:26 ` [PATCHv2 2/2] conf: Add support for new debian distro "buster" Henning Schild
@ 2018-05-27 19:54 ` Alexander Smirnov
2018-06-07 9:53 ` Maxim Yu. Osipov
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Alexander Smirnov @ 2018-05-27 19:54 UTC (permalink / raw)
To: Henning Schild, isar-users
Hi Henning,
thank you for the first patch, now there is no problem with trusted
repo. But there is another issue with wic:
8<--
ERROR: mc:qemui386-buster:isar-image-base-1.0-r0 do_wic_image: Function
failed: do_wic_image (log file is located at
/home/builder/isar/build/tmp/work/debian-buster-i386/isar-image-base/temp/log.do_wic_image.6282)
ERROR: Logfile of failure stored in:
/home/builder/isar/build/tmp/work/debian-buster-i386/isar-image-base/temp/log.do_wic_image.6282
Log data follows:
| DEBUG: Executing shell function do_wic_image
| Traceback (most recent call last):
| File "/home/builder/isar/scripts/wic", line 38, in <module>
| from distutils import spawn
| ImportError: cannot import name 'spawn'
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_wic_image (log file is located at
/home/builder/isar/build/tmp/work/debian-buster-i386/isar-image-base/temp/log.do_wic_image.6282)
ERROR: Task
(multiconfig:qemui386-buster:/home/builder/isar/meta-isar/recipes-core/images/isar-image-base.bb:do_wic_image)
failed with exit code '1'
NOTE: Tasks Summary: Attempted 48 tasks of which 0 didn't need to be
rerun and 1 failed.
Summary: 1 task failed:
multiconfig:qemui386-buster:/home/builder/isar/meta-isar/recipes-core/images/isar-image-base.bb:do_wic_image
Summary: There was 1 ERROR message shown, returning a non-zero exit code.
8<--
Do you have an idea what's wrong? Wic for default images (stretch) works
good...
Alex
On 05/24/2018 06:26 PM, Henning Schild wrote:
> Let us already include support for "buster" in Isar, to prove that we
> can build images and to find issues before it is declared stable.
>
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
> doc/user_manual.md | 2 +-
> meta-isar/conf/distro/debian-buster.conf | 7 +++++++
> meta-isar/conf/distro/debian-buster.list | 3 +++
> meta-isar/conf/local.conf.sample | 4 ++++
> meta-isar/conf/multiconfig/qemuamd64-buster.conf | 19 +++++++++++++++++++
> meta-isar/conf/multiconfig/qemuarm-buster.conf | 18 ++++++++++++++++++
> meta-isar/conf/multiconfig/qemuarm64-buster.conf | 18 ++++++++++++++++++
> meta-isar/conf/multiconfig/qemui386-buster.conf | 20 ++++++++++++++++++++
> scripts/ci_build.sh | 4 ++++
> scripts/vm_smoke_test | 4 ++++
> 10 files changed, 98 insertions(+), 1 deletion(-)
> create mode 100644 meta-isar/conf/distro/debian-buster.conf
> create mode 100644 meta-isar/conf/distro/debian-buster.list
> create mode 100644 meta-isar/conf/multiconfig/qemuamd64-buster.conf
> create mode 100644 meta-isar/conf/multiconfig/qemuarm-buster.conf
> create mode 100644 meta-isar/conf/multiconfig/qemuarm64-buster.conf
> create mode 100644 meta-isar/conf/multiconfig/qemui386-buster.conf
>
> diff --git a/doc/user_manual.md b/doc/user_manual.md
> index a2f4b92..5bba720 100644
> --- a/doc/user_manual.md
> +++ b/doc/user_manual.md
> @@ -53,7 +53,7 @@ Install the following packages:
> ```
> dosfstools
> git
> -debootstrap
> +debootstrap/jessie-backports# for debian >= "buster"
> parted
> python
> qemu
> diff --git a/meta-isar/conf/distro/debian-buster.conf b/meta-isar/conf/distro/debian-buster.conf
> new file mode 100644
> index 0000000..162257f
> --- /dev/null
> +++ b/meta-isar/conf/distro/debian-buster.conf
> @@ -0,0 +1,7 @@
> +# This software is a part of ISAR.
> +
> +DISTRO_APT_SOURCES += "conf/distro/debian-buster.list"
> +DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
> +DISTRO_KERNELS ?= "4kc-malta 586 5kc-malta 686 686-pae amd64 arm64 armmp \
> + armmp-lpae kirkwood loongson-3 marvell octeon orion5x powerpc64le \
> + rt-686-pae rt-amd64 s390x"
> diff --git a/meta-isar/conf/distro/debian-buster.list b/meta-isar/conf/distro/debian-buster.list
> new file mode 100644
> index 0000000..18311d8
> --- /dev/null
> +++ b/meta-isar/conf/distro/debian-buster.list
> @@ -0,0 +1,3 @@
> +deb http://ftp.de.debian.org/debian buster main contrib non-free
> +deb http://ftp.de.debian.org/debian buster-updates main contrib non-free
> +deb http://security.debian.org buster/updates main contrib non-free
> diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
> index 390cc4c..a9fa6cb 100644
> --- a/meta-isar/conf/local.conf.sample
> +++ b/meta-isar/conf/local.conf.sample
> @@ -41,11 +41,15 @@ BBMULTICONFIG = " \
> qemuarm-wheezy \
> qemuarm-jessie \
> qemuarm-stretch \
> + qemuarm-buster \
> qemuarm64-stretch \
> + qemuarm64-buster \
> qemui386-jessie \
> qemui386-stretch \
> + qemui386-buster \
> qemuamd64-jessie \
> qemuamd64-stretch \
> + qemuamd64-buster \
> rpi-jessie \
> "
>
> diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
> new file mode 100644
> index 0000000..85404ae
> --- /dev/null
> +++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
> @@ -0,0 +1,19 @@
> +# This software is a part of ISAR.
> +
> +MACHINE ?= "qemuamd64"
> +
> +DISTRO ?= "debian-buster"
> +DISTRO_ARCH ?= "amd64"
> +
> +KERNEL_NAME ?= "amd64"
> +
> +IMAGE_PREINSTALL += "init"
> +
> +IMAGE_TYPE ?= "wic-img"
> +
> +ROOTFS_DEV ?= "sda2"
> +
> +QEMU_ARCH ?= "x86_64"
> +QEMU_MACHINE ?= "q35"
> +QEMU_CPU ?= ""
> +QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE## -bios /usr/local/share/ovmf/OVMF.fd"
> diff --git a/meta-isar/conf/multiconfig/qemuarm-buster.conf b/meta-isar/conf/multiconfig/qemuarm-buster.conf
> new file mode 100644
> index 0000000..003f7c4
> --- /dev/null
> +++ b/meta-isar/conf/multiconfig/qemuarm-buster.conf
> @@ -0,0 +1,18 @@
> +# This software is a part of ISAR.
> +
> +MACHINE ?= "qemuarm"
> +
> +DISTRO ?= "debian-buster"
> +DISTRO_ARCH ?= "armhf"
> +
> +KERNEL_NAME ?= "armmp"
> +
> +IMAGE_PREINSTALL += "init"
> +
> +ROOTFS_DEV ?= "vda"
> +
> +QEMU_ARCH ?= "arm"
> +QEMU_MACHINE ?= "virt"
> +QEMU_CPU ?= "cortex-a15"
> +# TODO: start_vm doesn't support multiline vars
> +QEMU_ROOTFS_DEV ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
> diff --git a/meta-isar/conf/multiconfig/qemuarm64-buster.conf b/meta-isar/conf/multiconfig/qemuarm64-buster.conf
> new file mode 100644
> index 0000000..55ed421
> --- /dev/null
> +++ b/meta-isar/conf/multiconfig/qemuarm64-buster.conf
> @@ -0,0 +1,18 @@
> +# This software is a part of ISAR.
> +
> +MACHINE ?= "qemuarm64"
> +
> +DISTRO ?= "debian-buster"
> +DISTRO_ARCH ?= "arm64"
> +
> +KERNEL_NAME ?= "arm64"
> +
> +IMAGE_PREINSTALL += "init"
> +
> +ROOTFS_DEV ?= "vda"
> +
> +QEMU_ARCH ?= "aarch64"
> +QEMU_MACHINE ?= "virt"
> +QEMU_CPU ?= "cortex-a57"
> +# TODO: start_vm doesn't support multiline vars
> +QEMU_ROOTFS_DEV ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
> diff --git a/meta-isar/conf/multiconfig/qemui386-buster.conf b/meta-isar/conf/multiconfig/qemui386-buster.conf
> new file mode 100644
> index 0000000..e09cd0c
> --- /dev/null
> +++ b/meta-isar/conf/multiconfig/qemui386-buster.conf
> @@ -0,0 +1,20 @@
> +# This software is a part of ISAR.
> +
> +MACHINE ?= "qemui386"
> +
> +DISTRO ?= "debian-buster"
> +DISTRO_ARCH ?= "i386"
> +
> +KERNEL_NAME ?= "686-pae"
> +
> +IMAGE_PREINSTALL += "init"
> +
> +IMAGE_TYPE ?= "wic-img"
> +WKS_FILE ?= "directdisk-isar"
> +
> +ROOTFS_DEV ?= "sda2"
> +
> +QEMU_ARCH ?= "i386"
> +QEMU_MACHINE ?= "pc"
> +QEMU_CPU ?= ""
> +QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE##"
> diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
> index fec0000..ce8ccc2 100755
> --- a/scripts/ci_build.sh
> +++ b/scripts/ci_build.sh
> @@ -76,9 +76,13 @@ bitbake $BB_ARGS \
> multiconfig:qemuarm-wheezy:isar-image-base \
> multiconfig:qemuarm-jessie:isar-image-base \
> multiconfig:qemuarm-stretch:isar-image-base \
> + multiconfig:qemuarm-buster:isar-image-base \
> multiconfig:qemuarm64-stretch:isar-image-base \
> + multiconfig:qemuarm64-buster:isar-image-base \
> multiconfig:qemui386-jessie:isar-image-base \
> multiconfig:qemui386-stretch:isar-image-base \
> + multiconfig:qemui386-buster:isar-image-base \
> multiconfig:qemuamd64-jessie:isar-image-base \
> multiconfig:qemuamd64-stretch:isar-image-base \
> + multiconfig:qemuamd64-buster:isar-image-base \
> multiconfig:rpi-jessie:isar-image-base
> diff --git a/scripts/vm_smoke_test b/scripts/vm_smoke_test
> index a88d127..2205df1 100755
> --- a/scripts/vm_smoke_test
> +++ b/scripts/vm_smoke_test
> @@ -144,16 +144,20 @@ done
> # ARM machine
> run_test arm jessie
> run_test arm stretch
> +run_test arm buster
>
> # AMD64 machine
> run_test amd64 jessie
> run_test amd64 stretch
> +run_test amd64 buster
>
> # i386 machine
> run_test i386 jessie
> run_test i386 stretch
> +run_test i386 buster
>
> # ARM64 machine
> run_test arm64 stretch
> +run_test arm64 buster
>
> exit $RET
>
--
With best regards,
Alexander Smirnov
ilbers GmbH
Baierbrunner Str. 28c
D-81379 Munich
+49 (89) 122 67 24-0
http://ilbers.de/
Commercial register Munich, HRB 214197
General manager: Baurzhan Ismagulov
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCHv2 1/2] isar-apt: Mark repo as trusted in sources.list
2018-05-24 15:31 ` [PATCHv2 1/2] isar-apt: Mark repo as trusted in sources.list Henning Schild
@ 2018-06-01 15:52 ` Maxim Yu. Osipov
0 siblings, 0 replies; 10+ messages in thread
From: Maxim Yu. Osipov @ 2018-06-01 15:52 UTC (permalink / raw)
To: Henning Schild, isar-users; +Cc: Alexander Smirnov
On 05/24/2018 05:31 PM, Henning Schild wrote:
> This first patch was missing in v1. Note this might collide with stuff
> that Claudius has in the queue. Please merge if needed.
Merged and applied to next,
Thanks,
Maxim.
> The second patch was just rebased and the buster images in v2 use wic.
>
> Henning
>
> Am Thu, 24 May 2018 17:26:51 +0200
> schrieb Henning Schild <henning.schild@siemens.com>:
>
>> Mark our own repository 'isar-apt' trusted in sources.list, and then
>> drop the '--allow-unauthenticated' switch we used for apt-get so far.
>>
>> Signed-off-by: Henning Schild <henning.schild@siemens.com>
>> ---
>> meta/classes/isar-bootstrap-helper.bbclass | 5 ++---
>> meta/recipes-devtools/buildchroot/files/build.sh | 3 ---
>> 2 files changed, 2 insertions(+), 6 deletions(-)
>>
>> diff --git a/meta/classes/isar-bootstrap-helper.bbclass
>> b/meta/classes/isar-bootstrap-helper.bbclass index 4284d02..30f768c
>> 100644 --- a/meta/classes/isar-bootstrap-helper.bbclass
>> +++ b/meta/classes/isar-bootstrap-helper.bbclass
>> @@ -11,15 +11,14 @@ setup_root_file_system() {
>> shift
>> shift
>> PACKAGES="$@"
>> - APT_ARGS="install --yes --allow-unauthenticated \
>> - -o Debug::pkgProblemResolver=yes"
>> + APT_ARGS="install --yes -o Debug::pkgProblemResolver=yes"
>> CLEANHOSTLEAK_FILES="${ROOTFSDIR}/etc/hostname
>> ${ROOTFSDIR}/etc/resolv.conf"
>> sudo cp -Trpfx \
>> "${DEPLOY_DIR_IMAGE}/isar-bootstrap-${DISTRO}-${DISTRO_ARCH}/"
>> \ "$ROOTFSDIR"
>>
>> - echo "deb file:///isar-apt ${DEBDISTRONAME} main" | \
>> + echo "deb [trusted=yes] file:///isar-apt ${DEBDISTRONAME} main"
>> | \ sudo tee "$ROOTFSDIR/etc/apt/sources.list.d/isar-apt.list"
>>> /dev/null
>> echo "Package: *\nPin: release n=${DEBDISTRONAME}\nPin-Priority:
>> 1000" | \ diff --git
>> a/meta/recipes-devtools/buildchroot/files/build.sh
>> b/meta/recipes-devtools/buildchroot/files/build.sh index
>> aa769e4..73c0889 100644 ---
>> a/meta/recipes-devtools/buildchroot/files/build.sh +++
>> b/meta/recipes-devtools/buildchroot/files/build.sh @@ -20,9 +20,6 @@
>> export LANGUAGE=C # 2) we add -y to go non-interactive
>> install_cmd="apt-get -o Debug::pkgProblemResolver=yes
>> --no-install-recommends -y" -# Allow unauthenticated feeds
>> -install_cmd="${install_cmd} --allow-unauthenticated"
>> -
>> (
>> # Lock-protected because apt and dpkg do not wait in case of
>> contention flock 42 || exit 1
>
--
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCHv2 2/2] conf: Add support for new debian distro "buster"
2018-05-27 19:54 ` Alexander Smirnov
@ 2018-06-07 9:53 ` Maxim Yu. Osipov
2018-06-25 12:44 ` Henning Schild
2018-06-25 12:47 ` [PATCH v3] " Henning Schild
2 siblings, 0 replies; 10+ messages in thread
From: Maxim Yu. Osipov @ 2018-06-07 9:53 UTC (permalink / raw)
To: Henning Schild, isar-users; +Cc: Alexander Smirnov
Hello Henning,
Did you experience the problem Alexander reported in email below?
Kind regards,
Maxim.
On 05/27/2018 09:54 PM, Alexander Smirnov wrote:
> Hi Henning,
>
> thank you for the first patch, now there is no problem with trusted
> repo. But there is another issue with wic:
>
> 8<--
> ERROR: mc:qemui386-buster:isar-image-base-1.0-r0 do_wic_image: Function
> failed: do_wic_image (log file is located at
> /home/builder/isar/build/tmp/work/debian-buster-i386/isar-image-base/temp/log.do_wic_image.6282)
>
> ERROR: Logfile of failure stored in:
> /home/builder/isar/build/tmp/work/debian-buster-i386/isar-image-base/temp/log.do_wic_image.6282
>
> Log data follows:
> | DEBUG: Executing shell function do_wic_image
> | Traceback (most recent call last):
> | File "/home/builder/isar/scripts/wic", line 38, in <module>
> | from distutils import spawn
> | ImportError: cannot import name 'spawn'
> | WARNING: exit code 1 from a shell command.
> | ERROR: Function failed: do_wic_image (log file is located at
> /home/builder/isar/build/tmp/work/debian-buster-i386/isar-image-base/temp/log.do_wic_image.6282)
>
> ERROR: Task
> (multiconfig:qemui386-buster:/home/builder/isar/meta-isar/recipes-core/images/isar-image-base.bb:do_wic_image)
> failed with exit code '1'
> NOTE: Tasks Summary: Attempted 48 tasks of which 0 didn't need to be
> rerun and 1 failed.
>
> Summary: 1 task failed:
>
> multiconfig:qemui386-buster:/home/builder/isar/meta-isar/recipes-core/images/isar-image-base.bb:do_wic_image
>
> Summary: There was 1 ERROR message shown, returning a non-zero exit code.
> 8<--
>
> Do you have an idea what's wrong? Wic for default images (stretch) works
> good...
>
> Alex
>
> On 05/24/2018 06:26 PM, Henning Schild wrote:
>> Let us already include support for "buster" in Isar, to prove that we
>> can build images and to find issues before it is declared stable.
>>
>> Signed-off-by: Henning Schild <henning.schild@siemens.com>
>> ---
>> doc/user_manual.md | 2 +-
>> meta-isar/conf/distro/debian-buster.conf | 7 +++++++
>> meta-isar/conf/distro/debian-buster.list | 3 +++
>> meta-isar/conf/local.conf.sample | 4 ++++
>> meta-isar/conf/multiconfig/qemuamd64-buster.conf | 19
>> +++++++++++++++++++
>> meta-isar/conf/multiconfig/qemuarm-buster.conf | 18
>> ++++++++++++++++++
>> meta-isar/conf/multiconfig/qemuarm64-buster.conf | 18
>> ++++++++++++++++++
>> meta-isar/conf/multiconfig/qemui386-buster.conf | 20
>> ++++++++++++++++++++
>> scripts/ci_build.sh | 4 ++++
>> scripts/vm_smoke_test | 4 ++++
>> 10 files changed, 98 insertions(+), 1 deletion(-)
>> create mode 100644 meta-isar/conf/distro/debian-buster.conf
>> create mode 100644 meta-isar/conf/distro/debian-buster.list
>> create mode 100644 meta-isar/conf/multiconfig/qemuamd64-buster.conf
>> create mode 100644 meta-isar/conf/multiconfig/qemuarm-buster.conf
>> create mode 100644 meta-isar/conf/multiconfig/qemuarm64-buster.conf
>> create mode 100644 meta-isar/conf/multiconfig/qemui386-buster.conf
>>
>> diff --git a/doc/user_manual.md b/doc/user_manual.md
>> index a2f4b92..5bba720 100644
>> --- a/doc/user_manual.md
>> +++ b/doc/user_manual.md
>> @@ -53,7 +53,7 @@ Install the following packages:
>> ```
>> dosfstools
>> git
>> -debootstrap
>> +debootstrap/jessie-backports# for debian >= "buster"
>> parted
>> python
>> qemu
>> diff --git a/meta-isar/conf/distro/debian-buster.conf
>> b/meta-isar/conf/distro/debian-buster.conf
>> new file mode 100644
>> index 0000000..162257f
>> --- /dev/null
>> +++ b/meta-isar/conf/distro/debian-buster.conf
>> @@ -0,0 +1,7 @@
>> +# This software is a part of ISAR.
>> +
>> +DISTRO_APT_SOURCES += "conf/distro/debian-buster.list"
>> +DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
>> +DISTRO_KERNELS ?= "4kc-malta 586 5kc-malta 686 686-pae amd64 arm64
>> armmp \
>> + armmp-lpae kirkwood loongson-3 marvell octeon orion5x powerpc64le \
>> + rt-686-pae rt-amd64 s390x"
>> diff --git a/meta-isar/conf/distro/debian-buster.list
>> b/meta-isar/conf/distro/debian-buster.list
>> new file mode 100644
>> index 0000000..18311d8
>> --- /dev/null
>> +++ b/meta-isar/conf/distro/debian-buster.list
>> @@ -0,0 +1,3 @@
>> +deb http://ftp.de.debian.org/debian buster main contrib non-free
>> +deb http://ftp.de.debian.org/debian buster-updates main contrib
>> non-free
>> +deb http://security.debian.org buster/updates main contrib
>> non-free
>> diff --git a/meta-isar/conf/local.conf.sample
>> b/meta-isar/conf/local.conf.sample
>> index 390cc4c..a9fa6cb 100644
>> --- a/meta-isar/conf/local.conf.sample
>> +++ b/meta-isar/conf/local.conf.sample
>> @@ -41,11 +41,15 @@ BBMULTICONFIG = " \
>> qemuarm-wheezy \
>> qemuarm-jessie \
>> qemuarm-stretch \
>> + qemuarm-buster \
>> qemuarm64-stretch \
>> + qemuarm64-buster \
>> qemui386-jessie \
>> qemui386-stretch \
>> + qemui386-buster \
>> qemuamd64-jessie \
>> qemuamd64-stretch \
>> + qemuamd64-buster \
>> rpi-jessie \
>> "
>> diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf
>> b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
>> new file mode 100644
>> index 0000000..85404ae
>> --- /dev/null
>> +++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
>> @@ -0,0 +1,19 @@
>> +# This software is a part of ISAR.
>> +
>> +MACHINE ?= "qemuamd64"
>> +
>> +DISTRO ?= "debian-buster"
>> +DISTRO_ARCH ?= "amd64"
>> +
>> +KERNEL_NAME ?= "amd64"
>> +
>> +IMAGE_PREINSTALL += "init"
>> +
>> +IMAGE_TYPE ?= "wic-img"
>> +
>> +ROOTFS_DEV ?= "sda2"
>> +
>> +QEMU_ARCH ?= "x86_64"
>> +QEMU_MACHINE ?= "q35"
>> +QEMU_CPU ?= ""
>> +QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE## -bios
>> /usr/local/share/ovmf/OVMF.fd"
>> diff --git a/meta-isar/conf/multiconfig/qemuarm-buster.conf
>> b/meta-isar/conf/multiconfig/qemuarm-buster.conf
>> new file mode 100644
>> index 0000000..003f7c4
>> --- /dev/null
>> +++ b/meta-isar/conf/multiconfig/qemuarm-buster.conf
>> @@ -0,0 +1,18 @@
>> +# This software is a part of ISAR.
>> +
>> +MACHINE ?= "qemuarm"
>> +
>> +DISTRO ?= "debian-buster"
>> +DISTRO_ARCH ?= "armhf"
>> +
>> +KERNEL_NAME ?= "armmp"
>> +
>> +IMAGE_PREINSTALL += "init"
>> +
>> +ROOTFS_DEV ?= "vda"
>> +
>> +QEMU_ARCH ?= "arm"
>> +QEMU_MACHINE ?= "virt"
>> +QEMU_CPU ?= "cortex-a15"
>> +# TODO: start_vm doesn't support multiline vars
>> +QEMU_ROOTFS_DEV ?= "-drive
>> file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device
>> virtio-blk-device,drive=hd0"
>> diff --git a/meta-isar/conf/multiconfig/qemuarm64-buster.conf
>> b/meta-isar/conf/multiconfig/qemuarm64-buster.conf
>> new file mode 100644
>> index 0000000..55ed421
>> --- /dev/null
>> +++ b/meta-isar/conf/multiconfig/qemuarm64-buster.conf
>> @@ -0,0 +1,18 @@
>> +# This software is a part of ISAR.
>> +
>> +MACHINE ?= "qemuarm64"
>> +
>> +DISTRO ?= "debian-buster"
>> +DISTRO_ARCH ?= "arm64"
>> +
>> +KERNEL_NAME ?= "arm64"
>> +
>> +IMAGE_PREINSTALL += "init"
>> +
>> +ROOTFS_DEV ?= "vda"
>> +
>> +QEMU_ARCH ?= "aarch64"
>> +QEMU_MACHINE ?= "virt"
>> +QEMU_CPU ?= "cortex-a57"
>> +# TODO: start_vm doesn't support multiline vars
>> +QEMU_ROOTFS_DEV ?= "-drive
>> file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device
>> virtio-blk-device,drive=hd0"
>> diff --git a/meta-isar/conf/multiconfig/qemui386-buster.conf
>> b/meta-isar/conf/multiconfig/qemui386-buster.conf
>> new file mode 100644
>> index 0000000..e09cd0c
>> --- /dev/null
>> +++ b/meta-isar/conf/multiconfig/qemui386-buster.conf
>> @@ -0,0 +1,20 @@
>> +# This software is a part of ISAR.
>> +
>> +MACHINE ?= "qemui386"
>> +
>> +DISTRO ?= "debian-buster"
>> +DISTRO_ARCH ?= "i386"
>> +
>> +KERNEL_NAME ?= "686-pae"
>> +
>> +IMAGE_PREINSTALL += "init"
>> +
>> +IMAGE_TYPE ?= "wic-img"
>> +WKS_FILE ?= "directdisk-isar"
>> +
>> +ROOTFS_DEV ?= "sda2"
>> +
>> +QEMU_ARCH ?= "i386"
>> +QEMU_MACHINE ?= "pc"
>> +QEMU_CPU ?= ""
>> +QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE##"
>> diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
>> index fec0000..ce8ccc2 100755
>> --- a/scripts/ci_build.sh
>> +++ b/scripts/ci_build.sh
>> @@ -76,9 +76,13 @@ bitbake $BB_ARGS \
>> multiconfig:qemuarm-wheezy:isar-image-base \
>> multiconfig:qemuarm-jessie:isar-image-base \
>> multiconfig:qemuarm-stretch:isar-image-base \
>> + multiconfig:qemuarm-buster:isar-image-base \
>> multiconfig:qemuarm64-stretch:isar-image-base \
>> + multiconfig:qemuarm64-buster:isar-image-base \
>> multiconfig:qemui386-jessie:isar-image-base \
>> multiconfig:qemui386-stretch:isar-image-base \
>> + multiconfig:qemui386-buster:isar-image-base \
>> multiconfig:qemuamd64-jessie:isar-image-base \
>> multiconfig:qemuamd64-stretch:isar-image-base \
>> + multiconfig:qemuamd64-buster:isar-image-base \
>> multiconfig:rpi-jessie:isar-image-base
>> diff --git a/scripts/vm_smoke_test b/scripts/vm_smoke_test
>> index a88d127..2205df1 100755
>> --- a/scripts/vm_smoke_test
>> +++ b/scripts/vm_smoke_test
>> @@ -144,16 +144,20 @@ done
>> # ARM machine
>> run_test arm jessie
>> run_test arm stretch
>> +run_test arm buster
>> # AMD64 machine
>> run_test amd64 jessie
>> run_test amd64 stretch
>> +run_test amd64 buster
>> # i386 machine
>> run_test i386 jessie
>> run_test i386 stretch
>> +run_test i386 buster
>> # ARM64 machine
>> run_test arm64 stretch
>> +run_test arm64 buster
>> exit $RET
>>
>
--
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCHv2 2/2] conf: Add support for new debian distro "buster"
2018-05-27 19:54 ` Alexander Smirnov
2018-06-07 9:53 ` Maxim Yu. Osipov
@ 2018-06-25 12:44 ` Henning Schild
2018-06-25 12:47 ` [PATCH v3] " Henning Schild
2 siblings, 0 replies; 10+ messages in thread
From: Henning Schild @ 2018-06-25 12:44 UTC (permalink / raw)
To: Alexander Smirnov; +Cc: isar-users
Am Sun, 27 May 2018 22:54:17 +0300
schrieb Alexander Smirnov <asmirnov@ilbers.de>:
> Hi Henning,
>
> thank you for the first patch, now there is no problem with trusted
> repo. But there is another issue with wic:
Looks like buster has split up the python package since i first wrote
this patch. Patch updated and on the way.
Henning
> 8<--
> ERROR: mc:qemui386-buster:isar-image-base-1.0-r0 do_wic_image:
> Function failed: do_wic_image (log file is located at
> /home/builder/isar/build/tmp/work/debian-buster-i386/isar-image-base/temp/log.do_wic_image.6282)
> ERROR: Logfile of failure stored in:
> /home/builder/isar/build/tmp/work/debian-buster-i386/isar-image-base/temp/log.do_wic_image.6282
> Log data follows:
> | DEBUG: Executing shell function do_wic_image
> | Traceback (most recent call last):
> | File "/home/builder/isar/scripts/wic", line 38, in <module>
> | from distutils import spawn
> | ImportError: cannot import name 'spawn'
> | WARNING: exit code 1 from a shell command.
> | ERROR: Function failed: do_wic_image (log file is located at
> /home/builder/isar/build/tmp/work/debian-buster-i386/isar-image-base/temp/log.do_wic_image.6282)
> ERROR: Task
> (multiconfig:qemui386-buster:/home/builder/isar/meta-isar/recipes-core/images/isar-image-base.bb:do_wic_image)
> failed with exit code '1'
> NOTE: Tasks Summary: Attempted 48 tasks of which 0 didn't need to be
> rerun and 1 failed.
>
> Summary: 1 task failed:
>
> multiconfig:qemui386-buster:/home/builder/isar/meta-isar/recipes-core/images/isar-image-base.bb:do_wic_image
> Summary: There was 1 ERROR message shown, returning a non-zero exit
> code. 8<--
>
> Do you have an idea what's wrong? Wic for default images (stretch)
> works good...
>
> Alex
>
> On 05/24/2018 06:26 PM, Henning Schild wrote:
> > Let us already include support for "buster" in Isar, to prove that
> > we can build images and to find issues before it is declared stable.
> >
> > Signed-off-by: Henning Schild <henning.schild@siemens.com>
> > ---
> > doc/user_manual.md | 2 +-
> > meta-isar/conf/distro/debian-buster.conf | 7 +++++++
> > meta-isar/conf/distro/debian-buster.list | 3 +++
> > meta-isar/conf/local.conf.sample | 4 ++++
> > meta-isar/conf/multiconfig/qemuamd64-buster.conf | 19
> > +++++++++++++++++++
> > meta-isar/conf/multiconfig/qemuarm-buster.conf | 18
> > ++++++++++++++++++ meta-isar/conf/multiconfig/qemuarm64-buster.conf
> > | 18 ++++++++++++++++++
> > meta-isar/conf/multiconfig/qemui386-buster.conf | 20
> > ++++++++++++++++++++
> > scripts/ci_build.sh | 4 ++++
> > scripts/vm_smoke_test | 4 ++++ 10 files
> > changed, 98 insertions(+), 1 deletion(-) create mode 100644
> > meta-isar/conf/distro/debian-buster.conf create mode 100644
> > meta-isar/conf/distro/debian-buster.list create mode 100644
> > meta-isar/conf/multiconfig/qemuamd64-buster.conf create mode 100644
> > meta-isar/conf/multiconfig/qemuarm-buster.conf create mode 100644
> > meta-isar/conf/multiconfig/qemuarm64-buster.conf create mode 100644
> > meta-isar/conf/multiconfig/qemui386-buster.conf
> >
> > diff --git a/doc/user_manual.md b/doc/user_manual.md
> > index a2f4b92..5bba720 100644
> > --- a/doc/user_manual.md
> > +++ b/doc/user_manual.md
> > @@ -53,7 +53,7 @@ Install the following packages:
> > ```
> > dosfstools
> > git
> > -debootstrap
> > +debootstrap/jessie-backports# for debian >= "buster"
> > parted
> > python
> > qemu
> > diff --git a/meta-isar/conf/distro/debian-buster.conf
> > b/meta-isar/conf/distro/debian-buster.conf new file mode 100644
> > index 0000000..162257f
> > --- /dev/null
> > +++ b/meta-isar/conf/distro/debian-buster.conf
> > @@ -0,0 +1,7 @@
> > +# This software is a part of ISAR.
> > +
> > +DISTRO_APT_SOURCES += "conf/distro/debian-buster.list"
> > +DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
> > +DISTRO_KERNELS ?= "4kc-malta 586 5kc-malta 686 686-pae amd64 arm64
> > armmp \
> > + armmp-lpae kirkwood loongson-3 marvell octeon orion5x
> > powerpc64le \
> > + rt-686-pae rt-amd64 s390x"
> > diff --git a/meta-isar/conf/distro/debian-buster.list
> > b/meta-isar/conf/distro/debian-buster.list new file mode 100644
> > index 0000000..18311d8
> > --- /dev/null
> > +++ b/meta-isar/conf/distro/debian-buster.list
> > @@ -0,0 +1,3 @@
> > +deb http://ftp.de.debian.org/debian buster main
> > contrib non-free +deb http://ftp.de.debian.org/debian
> > buster-updates main contrib non-free +deb
> > http://security.debian.org buster/updates main
> > contrib non-free diff --git a/meta-isar/conf/local.conf.sample
> > b/meta-isar/conf/local.conf.sample index 390cc4c..a9fa6cb 100644
> > --- a/meta-isar/conf/local.conf.sample +++
> > b/meta-isar/conf/local.conf.sample @@ -41,11 +41,15 @@
> > BBMULTICONFIG = " \ qemuarm-wheezy \
> > qemuarm-jessie \
> > qemuarm-stretch \
> > + qemuarm-buster \
> > qemuarm64-stretch \
> > + qemuarm64-buster \
> > qemui386-jessie \
> > qemui386-stretch \
> > + qemui386-buster \
> > qemuamd64-jessie \
> > qemuamd64-stretch \
> > + qemuamd64-buster \
> > rpi-jessie \
> > "
> >
> > diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf
> > b/meta-isar/conf/multiconfig/qemuamd64-buster.conf new file mode
> > 100644 index 0000000..85404ae
> > --- /dev/null
> > +++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
> > @@ -0,0 +1,19 @@
> > +# This software is a part of ISAR.
> > +
> > +MACHINE ?= "qemuamd64"
> > +
> > +DISTRO ?= "debian-buster"
> > +DISTRO_ARCH ?= "amd64"
> > +
> > +KERNEL_NAME ?= "amd64"
> > +
> > +IMAGE_PREINSTALL += "init"
> > +
> > +IMAGE_TYPE ?= "wic-img"
> > +
> > +ROOTFS_DEV ?= "sda2"
> > +
> > +QEMU_ARCH ?= "x86_64"
> > +QEMU_MACHINE ?= "q35"
> > +QEMU_CPU ?= ""
> > +QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE##
> > -bios /usr/local/share/ovmf/OVMF.fd" diff --git
> > a/meta-isar/conf/multiconfig/qemuarm-buster.conf
> > b/meta-isar/conf/multiconfig/qemuarm-buster.conf new file mode
> > 100644 index 0000000..003f7c4 --- /dev/null
> > +++ b/meta-isar/conf/multiconfig/qemuarm-buster.conf
> > @@ -0,0 +1,18 @@
> > +# This software is a part of ISAR.
> > +
> > +MACHINE ?= "qemuarm"
> > +
> > +DISTRO ?= "debian-buster"
> > +DISTRO_ARCH ?= "armhf"
> > +
> > +KERNEL_NAME ?= "armmp"
> > +
> > +IMAGE_PREINSTALL += "init"
> > +
> > +ROOTFS_DEV ?= "vda"
> > +
> > +QEMU_ARCH ?= "arm"
> > +QEMU_MACHINE ?= "virt"
> > +QEMU_CPU ?= "cortex-a15"
> > +# TODO: start_vm doesn't support multiline vars
> > +QEMU_ROOTFS_DEV ?= "-drive
> > file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device
> > virtio-blk-device,drive=hd0" diff --git
> > a/meta-isar/conf/multiconfig/qemuarm64-buster.conf
> > b/meta-isar/conf/multiconfig/qemuarm64-buster.conf new file mode
> > 100644 index 0000000..55ed421 --- /dev/null +++
> > b/meta-isar/conf/multiconfig/qemuarm64-buster.conf @@ -0,0 +1,18 @@
> > +# This software is a part of ISAR.
> > +
> > +MACHINE ?= "qemuarm64"
> > +
> > +DISTRO ?= "debian-buster"
> > +DISTRO_ARCH ?= "arm64"
> > +
> > +KERNEL_NAME ?= "arm64"
> > +
> > +IMAGE_PREINSTALL += "init"
> > +
> > +ROOTFS_DEV ?= "vda"
> > +
> > +QEMU_ARCH ?= "aarch64"
> > +QEMU_MACHINE ?= "virt"
> > +QEMU_CPU ?= "cortex-a57"
> > +# TODO: start_vm doesn't support multiline vars
> > +QEMU_ROOTFS_DEV ?= "-drive
> > file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device
> > virtio-blk-device,drive=hd0" diff --git
> > a/meta-isar/conf/multiconfig/qemui386-buster.conf
> > b/meta-isar/conf/multiconfig/qemui386-buster.conf new file mode
> > 100644 index 0000000..e09cd0c --- /dev/null +++
> > b/meta-isar/conf/multiconfig/qemui386-buster.conf @@ -0,0 +1,20 @@
> > +# This software is a part of ISAR.
> > +
> > +MACHINE ?= "qemui386"
> > +
> > +DISTRO ?= "debian-buster"
> > +DISTRO_ARCH ?= "i386"
> > +
> > +KERNEL_NAME ?= "686-pae"
> > +
> > +IMAGE_PREINSTALL += "init"
> > +
> > +IMAGE_TYPE ?= "wic-img"
> > +WKS_FILE ?= "directdisk-isar"
> > +
> > +ROOTFS_DEV ?= "sda2"
> > +
> > +QEMU_ARCH ?= "i386"
> > +QEMU_MACHINE ?= "pc"
> > +QEMU_CPU ?= ""
> > +QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE##"
> > diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
> > index fec0000..ce8ccc2 100755
> > --- a/scripts/ci_build.sh
> > +++ b/scripts/ci_build.sh
> > @@ -76,9 +76,13 @@ bitbake $BB_ARGS \
> > multiconfig:qemuarm-wheezy:isar-image-base \
> > multiconfig:qemuarm-jessie:isar-image-base \
> > multiconfig:qemuarm-stretch:isar-image-base \
> > + multiconfig:qemuarm-buster:isar-image-base \
> > multiconfig:qemuarm64-stretch:isar-image-base \
> > + multiconfig:qemuarm64-buster:isar-image-base \
> > multiconfig:qemui386-jessie:isar-image-base \
> > multiconfig:qemui386-stretch:isar-image-base \
> > + multiconfig:qemui386-buster:isar-image-base \
> > multiconfig:qemuamd64-jessie:isar-image-base \
> > multiconfig:qemuamd64-stretch:isar-image-base \
> > + multiconfig:qemuamd64-buster:isar-image-base \
> > multiconfig:rpi-jessie:isar-image-base
> > diff --git a/scripts/vm_smoke_test b/scripts/vm_smoke_test
> > index a88d127..2205df1 100755
> > --- a/scripts/vm_smoke_test
> > +++ b/scripts/vm_smoke_test
> > @@ -144,16 +144,20 @@ done
> > # ARM machine
> > run_test arm jessie
> > run_test arm stretch
> > +run_test arm buster
> >
> > # AMD64 machine
> > run_test amd64 jessie
> > run_test amd64 stretch
> > +run_test amd64 buster
> >
> > # i386 machine
> > run_test i386 jessie
> > run_test i386 stretch
> > +run_test i386 buster
> >
> > # ARM64 machine
> > run_test arm64 stretch
> > +run_test arm64 buster
> >
> > exit $RET
> >
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v3] conf: Add support for new debian distro "buster"
2018-05-27 19:54 ` Alexander Smirnov
2018-06-07 9:53 ` Maxim Yu. Osipov
2018-06-25 12:44 ` Henning Schild
@ 2018-06-25 12:47 ` Henning Schild
2018-07-13 11:13 ` Maxim Yu. Osipov
2 siblings, 1 reply; 10+ messages in thread
From: Henning Schild @ 2018-06-25 12:47 UTC (permalink / raw)
To: isar-users; +Cc: Alexander Smirnov, Maxim Yu. Osipov, Henning Schild
Let us already include support for "buster" in Isar, to prove that we
can build images and to find issues before it is declared stable.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
doc/user_manual.md | 2 +-
meta-isar/conf/distro/debian-buster.conf | 7 +++++++
meta-isar/conf/distro/debian-buster.list | 3 +++
meta-isar/conf/local.conf.sample | 4 ++++
meta-isar/conf/multiconfig/qemuamd64-buster.conf | 19 +++++++++++++++++++
meta-isar/conf/multiconfig/qemuarm-buster.conf | 18 ++++++++++++++++++
meta-isar/conf/multiconfig/qemuarm64-buster.conf | 18 ++++++++++++++++++
meta-isar/conf/multiconfig/qemui386-buster.conf | 20 ++++++++++++++++++++
meta/recipes-devtools/buildchroot/buildchroot.bb | 2 ++
scripts/ci_build.sh | 4 ++++
scripts/vm_smoke_test | 4 ++++
11 files changed, 100 insertions(+), 1 deletion(-)
create mode 100644 meta-isar/conf/distro/debian-buster.conf
create mode 100644 meta-isar/conf/distro/debian-buster.list
create mode 100644 meta-isar/conf/multiconfig/qemuamd64-buster.conf
create mode 100644 meta-isar/conf/multiconfig/qemuarm-buster.conf
create mode 100644 meta-isar/conf/multiconfig/qemuarm64-buster.conf
create mode 100644 meta-isar/conf/multiconfig/qemui386-buster.conf
diff --git a/doc/user_manual.md b/doc/user_manual.md
index 9921f3a..55261bf 100644
--- a/doc/user_manual.md
+++ b/doc/user_manual.md
@@ -53,7 +53,7 @@ Install the following packages:
```
dosfstools
git
-debootstrap
+debootstrap/jessie-backports# for debian >= "buster"
parted
python
qemu
diff --git a/meta-isar/conf/distro/debian-buster.conf b/meta-isar/conf/distro/debian-buster.conf
new file mode 100644
index 0000000..162257f
--- /dev/null
+++ b/meta-isar/conf/distro/debian-buster.conf
@@ -0,0 +1,7 @@
+# This software is a part of ISAR.
+
+DISTRO_APT_SOURCES += "conf/distro/debian-buster.list"
+DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
+DISTRO_KERNELS ?= "4kc-malta 586 5kc-malta 686 686-pae amd64 arm64 armmp \
+ armmp-lpae kirkwood loongson-3 marvell octeon orion5x powerpc64le \
+ rt-686-pae rt-amd64 s390x"
diff --git a/meta-isar/conf/distro/debian-buster.list b/meta-isar/conf/distro/debian-buster.list
new file mode 100644
index 0000000..18311d8
--- /dev/null
+++ b/meta-isar/conf/distro/debian-buster.list
@@ -0,0 +1,3 @@
+deb http://ftp.de.debian.org/debian buster main contrib non-free
+deb http://ftp.de.debian.org/debian buster-updates main contrib non-free
+deb http://security.debian.org buster/updates main contrib non-free
diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
index 16ef488..ddb077f 100644
--- a/meta-isar/conf/local.conf.sample
+++ b/meta-isar/conf/local.conf.sample
@@ -41,12 +41,16 @@ BBMULTICONFIG = " \
qemuarm-wheezy \
qemuarm-jessie \
qemuarm-stretch \
+ qemuarm-buster \
qemuarm64-stretch \
+ qemuarm64-buster \
qemui386-jessie \
qemui386-stretch \
+ qemui386-buster \
qemuamd64-jessie \
qemuamd64-stretch \
bananapi-stretch \
+ qemuamd64-buster \
rpi-jessie \
"
diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
new file mode 100644
index 0000000..85404ae
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
@@ -0,0 +1,19 @@
+# This software is a part of ISAR.
+
+MACHINE ?= "qemuamd64"
+
+DISTRO ?= "debian-buster"
+DISTRO_ARCH ?= "amd64"
+
+KERNEL_NAME ?= "amd64"
+
+IMAGE_PREINSTALL += "init"
+
+IMAGE_TYPE ?= "wic-img"
+
+ROOTFS_DEV ?= "sda2"
+
+QEMU_ARCH ?= "x86_64"
+QEMU_MACHINE ?= "q35"
+QEMU_CPU ?= ""
+QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE## -bios /usr/local/share/ovmf/OVMF.fd"
diff --git a/meta-isar/conf/multiconfig/qemuarm-buster.conf b/meta-isar/conf/multiconfig/qemuarm-buster.conf
new file mode 100644
index 0000000..003f7c4
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemuarm-buster.conf
@@ -0,0 +1,18 @@
+# This software is a part of ISAR.
+
+MACHINE ?= "qemuarm"
+
+DISTRO ?= "debian-buster"
+DISTRO_ARCH ?= "armhf"
+
+KERNEL_NAME ?= "armmp"
+
+IMAGE_PREINSTALL += "init"
+
+ROOTFS_DEV ?= "vda"
+
+QEMU_ARCH ?= "arm"
+QEMU_MACHINE ?= "virt"
+QEMU_CPU ?= "cortex-a15"
+# TODO: start_vm doesn't support multiline vars
+QEMU_ROOTFS_DEV ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
diff --git a/meta-isar/conf/multiconfig/qemuarm64-buster.conf b/meta-isar/conf/multiconfig/qemuarm64-buster.conf
new file mode 100644
index 0000000..55ed421
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemuarm64-buster.conf
@@ -0,0 +1,18 @@
+# This software is a part of ISAR.
+
+MACHINE ?= "qemuarm64"
+
+DISTRO ?= "debian-buster"
+DISTRO_ARCH ?= "arm64"
+
+KERNEL_NAME ?= "arm64"
+
+IMAGE_PREINSTALL += "init"
+
+ROOTFS_DEV ?= "vda"
+
+QEMU_ARCH ?= "aarch64"
+QEMU_MACHINE ?= "virt"
+QEMU_CPU ?= "cortex-a57"
+# TODO: start_vm doesn't support multiline vars
+QEMU_ROOTFS_DEV ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
diff --git a/meta-isar/conf/multiconfig/qemui386-buster.conf b/meta-isar/conf/multiconfig/qemui386-buster.conf
new file mode 100644
index 0000000..e09cd0c
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemui386-buster.conf
@@ -0,0 +1,20 @@
+# This software is a part of ISAR.
+
+MACHINE ?= "qemui386"
+
+DISTRO ?= "debian-buster"
+DISTRO_ARCH ?= "i386"
+
+KERNEL_NAME ?= "686-pae"
+
+IMAGE_PREINSTALL += "init"
+
+IMAGE_TYPE ?= "wic-img"
+WKS_FILE ?= "directdisk-isar"
+
+ROOTFS_DEV ?= "sda2"
+
+QEMU_ARCH ?= "i386"
+QEMU_MACHINE ?= "pc"
+QEMU_CPU ?= ""
+QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE##"
diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb
index 2ed5cf2..b6b87cb 100644
--- a/meta/recipes-devtools/buildchroot/buildchroot.bb
+++ b/meta/recipes-devtools/buildchroot/buildchroot.bb
@@ -37,6 +37,8 @@ BUILDCHROOT_PREINSTALL_WIC = " \
e2fsprogs \
python3"
+BUILDCHROOT_PREINSTALL_WIC_append_debian-buster = " python3-distutils"
+
BUILDCHROOT_PREINSTALL_WIC_append_amd64 = " \
syslinux \
syslinux-common \
diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
index fec0000..ce8ccc2 100755
--- a/scripts/ci_build.sh
+++ b/scripts/ci_build.sh
@@ -76,9 +76,13 @@ bitbake $BB_ARGS \
multiconfig:qemuarm-wheezy:isar-image-base \
multiconfig:qemuarm-jessie:isar-image-base \
multiconfig:qemuarm-stretch:isar-image-base \
+ multiconfig:qemuarm-buster:isar-image-base \
multiconfig:qemuarm64-stretch:isar-image-base \
+ multiconfig:qemuarm64-buster:isar-image-base \
multiconfig:qemui386-jessie:isar-image-base \
multiconfig:qemui386-stretch:isar-image-base \
+ multiconfig:qemui386-buster:isar-image-base \
multiconfig:qemuamd64-jessie:isar-image-base \
multiconfig:qemuamd64-stretch:isar-image-base \
+ multiconfig:qemuamd64-buster:isar-image-base \
multiconfig:rpi-jessie:isar-image-base
diff --git a/scripts/vm_smoke_test b/scripts/vm_smoke_test
index a88d127..2205df1 100755
--- a/scripts/vm_smoke_test
+++ b/scripts/vm_smoke_test
@@ -144,16 +144,20 @@ done
# ARM machine
run_test arm jessie
run_test arm stretch
+run_test arm buster
# AMD64 machine
run_test amd64 jessie
run_test amd64 stretch
+run_test amd64 buster
# i386 machine
run_test i386 jessie
run_test i386 stretch
+run_test i386 buster
# ARM64 machine
run_test arm64 stretch
+run_test arm64 buster
exit $RET
--
2.16.4
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v3] conf: Add support for new debian distro "buster"
2018-06-25 12:47 ` [PATCH v3] " Henning Schild
@ 2018-07-13 11:13 ` Maxim Yu. Osipov
2018-07-13 12:36 ` Jan Kiszka
0 siblings, 1 reply; 10+ messages in thread
From: Maxim Yu. Osipov @ 2018-07-13 11:13 UTC (permalink / raw)
To: Henning Schild, isar-users; +Cc: Alexander Smirnov
On 06/25/2018 03:47 PM, Henning Schild wrote:
> Let us already include support for "buster" in Isar, to prove that we
> can build images and to find issues before it is declared stable.
During testing the patch on my Debian stretch system,
build for multiconfig:qemuarm64-buster:isar-image-base hangs on
mc:qemuarm64-buster:buildchroot-1.0-r0 do_build - 655s (pid 14197)
Corresponding log reports:
<snip>
Setting up libperl5.26:arm64 (5.26.2-6) ...
Setting up binutils-aarch64-linux-gnu (2.30-22) ...
Setting up man-db (2.8.3-2) ...
Building database of manual pages ...
qemu: Unsupported syscall: 277
Could you please have a look on that?
Kind regards,
Maxim.
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
> doc/user_manual.md | 2 +-
> meta-isar/conf/distro/debian-buster.conf | 7 +++++++
> meta-isar/conf/distro/debian-buster.list | 3 +++
> meta-isar/conf/local.conf.sample | 4 ++++
> meta-isar/conf/multiconfig/qemuamd64-buster.conf | 19 +++++++++++++++++++
> meta-isar/conf/multiconfig/qemuarm-buster.conf | 18 ++++++++++++++++++
> meta-isar/conf/multiconfig/qemuarm64-buster.conf | 18 ++++++++++++++++++
> meta-isar/conf/multiconfig/qemui386-buster.conf | 20 ++++++++++++++++++++
> meta/recipes-devtools/buildchroot/buildchroot.bb | 2 ++
> scripts/ci_build.sh | 4 ++++
> scripts/vm_smoke_test | 4 ++++
> 11 files changed, 100 insertions(+), 1 deletion(-)
> create mode 100644 meta-isar/conf/distro/debian-buster.conf
> create mode 100644 meta-isar/conf/distro/debian-buster.list
> create mode 100644 meta-isar/conf/multiconfig/qemuamd64-buster.conf
> create mode 100644 meta-isar/conf/multiconfig/qemuarm-buster.conf
> create mode 100644 meta-isar/conf/multiconfig/qemuarm64-buster.conf
> create mode 100644 meta-isar/conf/multiconfig/qemui386-buster.conf
>
> diff --git a/doc/user_manual.md b/doc/user_manual.md
> index 9921f3a..55261bf 100644
> --- a/doc/user_manual.md
> +++ b/doc/user_manual.md
> @@ -53,7 +53,7 @@ Install the following packages:
> ```
> dosfstools
> git
> -debootstrap
> +debootstrap/jessie-backports# for debian >= "buster"
> parted
> python
> qemu
> diff --git a/meta-isar/conf/distro/debian-buster.conf b/meta-isar/conf/distro/debian-buster.conf
> new file mode 100644
> index 0000000..162257f
> --- /dev/null
> +++ b/meta-isar/conf/distro/debian-buster.conf
> @@ -0,0 +1,7 @@
> +# This software is a part of ISAR.
> +
> +DISTRO_APT_SOURCES += "conf/distro/debian-buster.list"
> +DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
> +DISTRO_KERNELS ?= "4kc-malta 586 5kc-malta 686 686-pae amd64 arm64 armmp \
> + armmp-lpae kirkwood loongson-3 marvell octeon orion5x powerpc64le \
> + rt-686-pae rt-amd64 s390x"
> diff --git a/meta-isar/conf/distro/debian-buster.list b/meta-isar/conf/distro/debian-buster.list
> new file mode 100644
> index 0000000..18311d8
> --- /dev/null
> +++ b/meta-isar/conf/distro/debian-buster.list
> @@ -0,0 +1,3 @@
> +deb http://ftp.de.debian.org/debian buster main contrib non-free
> +deb http://ftp.de.debian.org/debian buster-updates main contrib non-free
> +deb http://security.debian.org buster/updates main contrib non-free
> diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
> index 16ef488..ddb077f 100644
> --- a/meta-isar/conf/local.conf.sample
> +++ b/meta-isar/conf/local.conf.sample
> @@ -41,12 +41,16 @@ BBMULTICONFIG = " \
> qemuarm-wheezy \
> qemuarm-jessie \
> qemuarm-stretch \
> + qemuarm-buster \
> qemuarm64-stretch \
> + qemuarm64-buster \
> qemui386-jessie \
> qemui386-stretch \
> + qemui386-buster \
> qemuamd64-jessie \
> qemuamd64-stretch \
> bananapi-stretch \
> + qemuamd64-buster \
> rpi-jessie \
> "
>
> diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
> new file mode 100644
> index 0000000..85404ae
> --- /dev/null
> +++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
> @@ -0,0 +1,19 @@
> +# This software is a part of ISAR.
> +
> +MACHINE ?= "qemuamd64"
> +
> +DISTRO ?= "debian-buster"
> +DISTRO_ARCH ?= "amd64"
> +
> +KERNEL_NAME ?= "amd64"
> +
> +IMAGE_PREINSTALL += "init"
> +
> +IMAGE_TYPE ?= "wic-img"
> +
> +ROOTFS_DEV ?= "sda2"
> +
> +QEMU_ARCH ?= "x86_64"
> +QEMU_MACHINE ?= "q35"
> +QEMU_CPU ?= ""
> +QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE## -bios /usr/local/share/ovmf/OVMF.fd"
> diff --git a/meta-isar/conf/multiconfig/qemuarm-buster.conf b/meta-isar/conf/multiconfig/qemuarm-buster.conf
> new file mode 100644
> index 0000000..003f7c4
> --- /dev/null
> +++ b/meta-isar/conf/multiconfig/qemuarm-buster.conf
> @@ -0,0 +1,18 @@
> +# This software is a part of ISAR.
> +
> +MACHINE ?= "qemuarm"
> +
> +DISTRO ?= "debian-buster"
> +DISTRO_ARCH ?= "armhf"
> +
> +KERNEL_NAME ?= "armmp"
> +
> +IMAGE_PREINSTALL += "init"
> +
> +ROOTFS_DEV ?= "vda"
> +
> +QEMU_ARCH ?= "arm"
> +QEMU_MACHINE ?= "virt"
> +QEMU_CPU ?= "cortex-a15"
> +# TODO: start_vm doesn't support multiline vars
> +QEMU_ROOTFS_DEV ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
> diff --git a/meta-isar/conf/multiconfig/qemuarm64-buster.conf b/meta-isar/conf/multiconfig/qemuarm64-buster.conf
> new file mode 100644
> index 0000000..55ed421
> --- /dev/null
> +++ b/meta-isar/conf/multiconfig/qemuarm64-buster.conf
> @@ -0,0 +1,18 @@
> +# This software is a part of ISAR.
> +
> +MACHINE ?= "qemuarm64"
> +
> +DISTRO ?= "debian-buster"
> +DISTRO_ARCH ?= "arm64"
> +
> +KERNEL_NAME ?= "arm64"
> +
> +IMAGE_PREINSTALL += "init"
> +
> +ROOTFS_DEV ?= "vda"
> +
> +QEMU_ARCH ?= "aarch64"
> +QEMU_MACHINE ?= "virt"
> +QEMU_CPU ?= "cortex-a57"
> +# TODO: start_vm doesn't support multiline vars
> +QEMU_ROOTFS_DEV ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
> diff --git a/meta-isar/conf/multiconfig/qemui386-buster.conf b/meta-isar/conf/multiconfig/qemui386-buster.conf
> new file mode 100644
> index 0000000..e09cd0c
> --- /dev/null
> +++ b/meta-isar/conf/multiconfig/qemui386-buster.conf
> @@ -0,0 +1,20 @@
> +# This software is a part of ISAR.
> +
> +MACHINE ?= "qemui386"
> +
> +DISTRO ?= "debian-buster"
> +DISTRO_ARCH ?= "i386"
> +
> +KERNEL_NAME ?= "686-pae"
> +
> +IMAGE_PREINSTALL += "init"
> +
> +IMAGE_TYPE ?= "wic-img"
> +WKS_FILE ?= "directdisk-isar"
> +
> +ROOTFS_DEV ?= "sda2"
> +
> +QEMU_ARCH ?= "i386"
> +QEMU_MACHINE ?= "pc"
> +QEMU_CPU ?= ""
> +QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE##"
> diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb
> index 2ed5cf2..b6b87cb 100644
> --- a/meta/recipes-devtools/buildchroot/buildchroot.bb
> +++ b/meta/recipes-devtools/buildchroot/buildchroot.bb
> @@ -37,6 +37,8 @@ BUILDCHROOT_PREINSTALL_WIC = " \
> e2fsprogs \
> python3"
>
> +BUILDCHROOT_PREINSTALL_WIC_append_debian-buster = " python3-distutils"
> +
> BUILDCHROOT_PREINSTALL_WIC_append_amd64 = " \
> syslinux \
> syslinux-common \
> diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
> index fec0000..ce8ccc2 100755
> --- a/scripts/ci_build.sh
> +++ b/scripts/ci_build.sh
> @@ -76,9 +76,13 @@ bitbake $BB_ARGS \
> multiconfig:qemuarm-wheezy:isar-image-base \
> multiconfig:qemuarm-jessie:isar-image-base \
> multiconfig:qemuarm-stretch:isar-image-base \
> + multiconfig:qemuarm-buster:isar-image-base \
> multiconfig:qemuarm64-stretch:isar-image-base \
> + multiconfig:qemuarm64-buster:isar-image-base \
> multiconfig:qemui386-jessie:isar-image-base \
> multiconfig:qemui386-stretch:isar-image-base \
> + multiconfig:qemui386-buster:isar-image-base \
> multiconfig:qemuamd64-jessie:isar-image-base \
> multiconfig:qemuamd64-stretch:isar-image-base \
> + multiconfig:qemuamd64-buster:isar-image-base \
> multiconfig:rpi-jessie:isar-image-base
> diff --git a/scripts/vm_smoke_test b/scripts/vm_smoke_test
> index a88d127..2205df1 100755
> --- a/scripts/vm_smoke_test
> +++ b/scripts/vm_smoke_test
> @@ -144,16 +144,20 @@ done
> # ARM machine
> run_test arm jessie
> run_test arm stretch
> +run_test arm buster
>
> # AMD64 machine
> run_test amd64 jessie
> run_test amd64 stretch
> +run_test amd64 buster
>
> # i386 machine
> run_test i386 jessie
> run_test i386 stretch
> +run_test i386 buster
>
> # ARM64 machine
> run_test arm64 stretch
> +run_test arm64 buster
>
> exit $RET
>
--
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v3] conf: Add support for new debian distro "buster"
2018-07-13 11:13 ` Maxim Yu. Osipov
@ 2018-07-13 12:36 ` Jan Kiszka
0 siblings, 0 replies; 10+ messages in thread
From: Jan Kiszka @ 2018-07-13 12:36 UTC (permalink / raw)
To: Maxim Yu. Osipov, Henning Schild, isar-users; +Cc: Alexander Smirnov
On 2018-07-13 13:13, Maxim Yu. Osipov wrote:
> On 06/25/2018 03:47 PM, Henning Schild wrote:
>> Let us already include support for "buster" in Isar, to prove that we
>> can build images and to find issues before it is declared stable.
>
> During testing the patch on my Debian stretch system,
> build for multiconfig:qemuarm64-buster:isar-image-base hangs on
>
> mc:qemuarm64-buster:buildchroot-1.0-r0 do_build - 655s (pid 14197)
>
> Corresponding log reports:
>
> <snip>
>
> Setting up libperl5.26:arm64 (5.26.2-6) ...
> Setting up binutils-aarch64-linux-gnu (2.30-22) ...
> Setting up man-db (2.8.3-2) ...
> Building database of manual pages ...
> qemu: Unsupported syscall: 277
>
I let this run as well and I can also reproduce it with our docker build
container. syscall 277 is seccomp - and that error is new. Not sure,
though, if that could cause the blocking because seccomp should not be
mandatory. Maybe worth to try if buster builds over buster, i.e. a newer
version of qemu-user.
Jan
>
> Could you please have a look on that?
>
> Kind regards,
> Maxim.
>
>> Signed-off-by: Henning Schild <henning.schild@siemens.com>
>> ---
>> doc/user_manual.md | 2 +-
>> meta-isar/conf/distro/debian-buster.conf | 7 +++++++
>> meta-isar/conf/distro/debian-buster.list | 3 +++
>> meta-isar/conf/local.conf.sample | 4 ++++
>> meta-isar/conf/multiconfig/qemuamd64-buster.conf | 19
>> +++++++++++++++++++
>> meta-isar/conf/multiconfig/qemuarm-buster.conf | 18
>> ++++++++++++++++++
>> meta-isar/conf/multiconfig/qemuarm64-buster.conf | 18
>> ++++++++++++++++++
>> meta-isar/conf/multiconfig/qemui386-buster.conf | 20
>> ++++++++++++++++++++
>> meta/recipes-devtools/buildchroot/buildchroot.bb | 2 ++
>> scripts/ci_build.sh | 4 ++++
>> scripts/vm_smoke_test | 4 ++++
>> 11 files changed, 100 insertions(+), 1 deletion(-)
>> create mode 100644 meta-isar/conf/distro/debian-buster.conf
>> create mode 100644 meta-isar/conf/distro/debian-buster.list
>> create mode 100644 meta-isar/conf/multiconfig/qemuamd64-buster.conf
>> create mode 100644 meta-isar/conf/multiconfig/qemuarm-buster.conf
>> create mode 100644 meta-isar/conf/multiconfig/qemuarm64-buster.conf
>> create mode 100644 meta-isar/conf/multiconfig/qemui386-buster.conf
>>
>> diff --git a/doc/user_manual.md b/doc/user_manual.md
>> index 9921f3a..55261bf 100644
>> --- a/doc/user_manual.md
>> +++ b/doc/user_manual.md
>> @@ -53,7 +53,7 @@ Install the following packages:
>> ```
>> dosfstools
>> git
>> -debootstrap
>> +debootstrap/jessie-backports# for debian >= "buster"
>> parted
>> python
>> qemu
>> diff --git a/meta-isar/conf/distro/debian-buster.conf
>> b/meta-isar/conf/distro/debian-buster.conf
>> new file mode 100644
>> index 0000000..162257f
>> --- /dev/null
>> +++ b/meta-isar/conf/distro/debian-buster.conf
>> @@ -0,0 +1,7 @@
>> +# This software is a part of ISAR.
>> +
>> +DISTRO_APT_SOURCES += "conf/distro/debian-buster.list"
>> +DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
>> +DISTRO_KERNELS ?= "4kc-malta 586 5kc-malta 686 686-pae amd64 arm64
>> armmp \
>> + armmp-lpae kirkwood loongson-3 marvell octeon orion5x powerpc64le \
>> + rt-686-pae rt-amd64 s390x"
>> diff --git a/meta-isar/conf/distro/debian-buster.list
>> b/meta-isar/conf/distro/debian-buster.list
>> new file mode 100644
>> index 0000000..18311d8
>> --- /dev/null
>> +++ b/meta-isar/conf/distro/debian-buster.list
>> @@ -0,0 +1,3 @@
>> +deb http://ftp.de.debian.org/debian buster main contrib non-free
>> +deb http://ftp.de.debian.org/debian buster-updates main contrib
>> non-free
>> +deb http://security.debian.org buster/updates main contrib
>> non-free
>> diff --git a/meta-isar/conf/local.conf.sample
>> b/meta-isar/conf/local.conf.sample
>> index 16ef488..ddb077f 100644
>> --- a/meta-isar/conf/local.conf.sample
>> +++ b/meta-isar/conf/local.conf.sample
>> @@ -41,12 +41,16 @@ BBMULTICONFIG = " \
>> qemuarm-wheezy \
>> qemuarm-jessie \
>> qemuarm-stretch \
>> + qemuarm-buster \
>> qemuarm64-stretch \
>> + qemuarm64-buster \
>> qemui386-jessie \
>> qemui386-stretch \
>> + qemui386-buster \
>> qemuamd64-jessie \
>> qemuamd64-stretch \
>> bananapi-stretch \
>> + qemuamd64-buster \
>> rpi-jessie \
>> "
>> diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf
>> b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
>> new file mode 100644
>> index 0000000..85404ae
>> --- /dev/null
>> +++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
>> @@ -0,0 +1,19 @@
>> +# This software is a part of ISAR.
>> +
>> +MACHINE ?= "qemuamd64"
>> +
>> +DISTRO ?= "debian-buster"
>> +DISTRO_ARCH ?= "amd64"
>> +
>> +KERNEL_NAME ?= "amd64"
>> +
>> +IMAGE_PREINSTALL += "init"
>> +
>> +IMAGE_TYPE ?= "wic-img"
>> +
>> +ROOTFS_DEV ?= "sda2"
>> +
>> +QEMU_ARCH ?= "x86_64"
>> +QEMU_MACHINE ?= "q35"
>> +QEMU_CPU ?= ""
>> +QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE## -bios
>> /usr/local/share/ovmf/OVMF.fd"
>> diff --git a/meta-isar/conf/multiconfig/qemuarm-buster.conf
>> b/meta-isar/conf/multiconfig/qemuarm-buster.conf
>> new file mode 100644
>> index 0000000..003f7c4
>> --- /dev/null
>> +++ b/meta-isar/conf/multiconfig/qemuarm-buster.conf
>> @@ -0,0 +1,18 @@
>> +# This software is a part of ISAR.
>> +
>> +MACHINE ?= "qemuarm"
>> +
>> +DISTRO ?= "debian-buster"
>> +DISTRO_ARCH ?= "armhf"
>> +
>> +KERNEL_NAME ?= "armmp"
>> +
>> +IMAGE_PREINSTALL += "init"
>> +
>> +ROOTFS_DEV ?= "vda"
>> +
>> +QEMU_ARCH ?= "arm"
>> +QEMU_MACHINE ?= "virt"
>> +QEMU_CPU ?= "cortex-a15"
>> +# TODO: start_vm doesn't support multiline vars
>> +QEMU_ROOTFS_DEV ?= "-drive
>> file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device
>> virtio-blk-device,drive=hd0"
>> diff --git a/meta-isar/conf/multiconfig/qemuarm64-buster.conf
>> b/meta-isar/conf/multiconfig/qemuarm64-buster.conf
>> new file mode 100644
>> index 0000000..55ed421
>> --- /dev/null
>> +++ b/meta-isar/conf/multiconfig/qemuarm64-buster.conf
>> @@ -0,0 +1,18 @@
>> +# This software is a part of ISAR.
>> +
>> +MACHINE ?= "qemuarm64"
>> +
>> +DISTRO ?= "debian-buster"
>> +DISTRO_ARCH ?= "arm64"
>> +
>> +KERNEL_NAME ?= "arm64"
>> +
>> +IMAGE_PREINSTALL += "init"
>> +
>> +ROOTFS_DEV ?= "vda"
>> +
>> +QEMU_ARCH ?= "aarch64"
>> +QEMU_MACHINE ?= "virt"
>> +QEMU_CPU ?= "cortex-a57"
>> +# TODO: start_vm doesn't support multiline vars
>> +QEMU_ROOTFS_DEV ?= "-drive
>> file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device
>> virtio-blk-device,drive=hd0"
>> diff --git a/meta-isar/conf/multiconfig/qemui386-buster.conf
>> b/meta-isar/conf/multiconfig/qemui386-buster.conf
>> new file mode 100644
>> index 0000000..e09cd0c
>> --- /dev/null
>> +++ b/meta-isar/conf/multiconfig/qemui386-buster.conf
>> @@ -0,0 +1,20 @@
>> +# This software is a part of ISAR.
>> +
>> +MACHINE ?= "qemui386"
>> +
>> +DISTRO ?= "debian-buster"
>> +DISTRO_ARCH ?= "i386"
>> +
>> +KERNEL_NAME ?= "686-pae"
>> +
>> +IMAGE_PREINSTALL += "init"
>> +
>> +IMAGE_TYPE ?= "wic-img"
>> +WKS_FILE ?= "directdisk-isar"
>> +
>> +ROOTFS_DEV ?= "sda2"
>> +
>> +QEMU_ARCH ?= "i386"
>> +QEMU_MACHINE ?= "pc"
>> +QEMU_CPU ?= ""
>> +QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE##"
>> diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb
>> b/meta/recipes-devtools/buildchroot/buildchroot.bb
>> index 2ed5cf2..b6b87cb 100644
>> --- a/meta/recipes-devtools/buildchroot/buildchroot.bb
>> +++ b/meta/recipes-devtools/buildchroot/buildchroot.bb
>> @@ -37,6 +37,8 @@ BUILDCHROOT_PREINSTALL_WIC = " \
>> e2fsprogs \
>> python3"
>> +BUILDCHROOT_PREINSTALL_WIC_append_debian-buster = " python3-distutils"
>> +
>> BUILDCHROOT_PREINSTALL_WIC_append_amd64 = " \
>> syslinux \
>> syslinux-common \
>> diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
>> index fec0000..ce8ccc2 100755
>> --- a/scripts/ci_build.sh
>> +++ b/scripts/ci_build.sh
>> @@ -76,9 +76,13 @@ bitbake $BB_ARGS \
>> multiconfig:qemuarm-wheezy:isar-image-base \
>> multiconfig:qemuarm-jessie:isar-image-base \
>> multiconfig:qemuarm-stretch:isar-image-base \
>> + multiconfig:qemuarm-buster:isar-image-base \
>> multiconfig:qemuarm64-stretch:isar-image-base \
>> + multiconfig:qemuarm64-buster:isar-image-base \
>> multiconfig:qemui386-jessie:isar-image-base \
>> multiconfig:qemui386-stretch:isar-image-base \
>> + multiconfig:qemui386-buster:isar-image-base \
>> multiconfig:qemuamd64-jessie:isar-image-base \
>> multiconfig:qemuamd64-stretch:isar-image-base \
>> + multiconfig:qemuamd64-buster:isar-image-base \
>> multiconfig:rpi-jessie:isar-image-base
>> diff --git a/scripts/vm_smoke_test b/scripts/vm_smoke_test
>> index a88d127..2205df1 100755
>> --- a/scripts/vm_smoke_test
>> +++ b/scripts/vm_smoke_test
>> @@ -144,16 +144,20 @@ done
>> # ARM machine
>> run_test arm jessie
>> run_test arm stretch
>> +run_test arm buster
>> # AMD64 machine
>> run_test amd64 jessie
>> run_test amd64 stretch
>> +run_test amd64 buster
>> # i386 machine
>> run_test i386 jessie
>> run_test i386 stretch
>> +run_test i386 buster
>> # ARM64 machine
>> run_test arm64 stretch
>> +run_test arm64 buster
>> exit $RET
>>
>
>
--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2018-07-13 12:36 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-24 15:26 [PATCHv2 1/2] isar-apt: Mark repo as trusted in sources.list Henning Schild
2018-05-24 15:26 ` [PATCHv2 2/2] conf: Add support for new debian distro "buster" Henning Schild
2018-05-27 19:54 ` Alexander Smirnov
2018-06-07 9:53 ` Maxim Yu. Osipov
2018-06-25 12:44 ` Henning Schild
2018-06-25 12:47 ` [PATCH v3] " Henning Schild
2018-07-13 11:13 ` Maxim Yu. Osipov
2018-07-13 12:36 ` Jan Kiszka
2018-05-24 15:31 ` [PATCHv2 1/2] isar-apt: Mark repo as trusted in sources.list Henning Schild
2018-06-01 15:52 ` Maxim Yu. Osipov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox