|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH 1/2] automation: Remove XEN_CONFIG_EXPERT leftovers
The EXPERT config option cannot anymore be selected via the environmental
variable XEN_CONFIG_EXPERT. Remove stale references to XEN_CONFIG_EXPERT
from the automation code.
Signed-off-by: Xenia Ragiadakou <burzalodowa@xxxxxxxxx>
---
automation/build/README.md | 3 ---
automation/scripts/build | 4 ++--
automation/scripts/containerize | 1 -
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/automation/build/README.md b/automation/build/README.md
index 2137957408..00305eed03 100644
--- a/automation/build/README.md
+++ b/automation/build/README.md
@@ -65,9 +65,6 @@ understands.
- CONTAINER_NO_PULL: If set to 1, the script will not pull from docker hub.
This is useful when testing container locally.
-- XEN_CONFIG_EXPERT: If this is defined in your shell it will be
- automatically passed through to the container.
-
If your docker host has Linux kernel > 4.11, and you want to use containers
that run old glibc (for example, CentOS 6 or SLES11SP4), you may need to add
diff --git a/automation/scripts/build b/automation/scripts/build
index 281f8b1fcc..21b3bc57c8 100755
--- a/automation/scripts/build
+++ b/automation/scripts/build
@@ -91,6 +91,6 @@ for cfg in `ls ${cfg_dir}`; do
echo "Building $cfg"
make -j$(nproc) -C xen clean
rm -f xen/.config
- make -C xen KBUILD_DEFCONFIG=../../../../${cfg_dir}/${cfg}
XEN_CONFIG_EXPERT=y defconfig
- make -j$(nproc) -C xen XEN_CONFIG_EXPERT=y
+ make -C xen KBUILD_DEFCONFIG=../../../../${cfg_dir}/${cfg} defconfig
+ make -j$(nproc) -C xen
done
diff --git a/automation/scripts/containerize b/automation/scripts/containerize
index 8992c67278..9d4beca4fa 100755
--- a/automation/scripts/containerize
+++ b/automation/scripts/containerize
@@ -101,7 +101,6 @@ exec ${docker_cmd} run \
-v "${CONTAINER_PATH}":/build:rw${selinux} \
-v "${HOME}/.ssh":/root/.ssh:ro \
${SSH_AUTH_DIR:+-v "${SSH_AUTH_DIR}":/tmp/ssh-agent${selinux}} \
- ${XEN_CONFIG_EXPERT:+-e XEN_CONFIG_EXPERT=${XEN_CONFIG_EXPERT}} \
${CONTAINER_ARGS} \
-${termint}i --rm -- \
${CONTAINER} \
--
2.34.1
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |