From 6de856af31b39e88fe8c5c590fba920f9bc9edfc Mon Sep 17 00:00:00 2001 From: Philippe Vanhaesendonck Date: Fri, 17 May 2024 18:04:45 +0200 Subject: [PATCH 1/4] feat(olit): :sparkles: ol9u4 updates Signed-off-by: Philippe Vanhaesendonck --- oracle-linux-image-tools/README.md | 2 +- oracle-linux-image-tools/distr/ol9-aarch64/env.properties | 2 +- oracle-linux-image-tools/distr/ol9-slim/env.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/oracle-linux-image-tools/README.md b/oracle-linux-image-tools/README.md index a2577bd..5665f1c 100755 --- a/oracle-linux-image-tools/README.md +++ b/oracle-linux-image-tools/README.md @@ -110,7 +110,7 @@ In that case, you will have to provide an URL to an installation tree and option Example for an Oracle Linux 9 using the UEK boot ISO: ```Shell -ISO_URL="https://yum.oracle.com/ISOS/OracleLinux/OL9/u3/x86_64/OracleLinux-R9-U3-x86_64-boot-uek.iso" +ISO_URL="https://yum.oracle.com/ISOS/OracleLinux/OL9/u4/x86_64/OracleLinux-R9-U4-x86_64-boot-uek.iso" REPO_URL="https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64" REPO[AppStream]="https://yum.oracle.com/repo/OracleLinux/OL9/appstream/x86_64" REPO[ol9_UEKR7]="https://yum.oracle.com/repo/OracleLinux/OL9/UEKR7/x86_64" diff --git a/oracle-linux-image-tools/distr/ol9-aarch64/env.properties b/oracle-linux-image-tools/distr/ol9-aarch64/env.properties index 6435ece..8f9b1a3 100644 --- a/oracle-linux-image-tools/distr/ol9-aarch64/env.properties +++ b/oracle-linux-image-tools/distr/ol9-aarch64/env.properties @@ -3,7 +3,7 @@ # env file. # Distribution name -DISTR_NAME="OL9U3_aarch64" +DISTR_NAME="OL9U4_aarch64" # Distribution release readonly ORACLE_RELEASE=9 diff --git a/oracle-linux-image-tools/distr/ol9-slim/env.properties b/oracle-linux-image-tools/distr/ol9-slim/env.properties index 54165fe..cf57390 100644 --- a/oracle-linux-image-tools/distr/ol9-slim/env.properties +++ b/oracle-linux-image-tools/distr/ol9-slim/env.properties @@ -3,7 +3,7 @@ # env file. # Distribution name -DISTR_NAME="OL9U3_x86_64" +DISTR_NAME="OL9U4_x86_64" # Distribution release readonly ORACLE_RELEASE=9 From 03cb7d4372de1f6e588eabdb97249e72d1efd2af Mon Sep 17 00:00:00 2001 From: Philippe Vanhaesendonck Date: Tue, 21 May 2024 18:38:01 +0200 Subject: [PATCH 2/4] fix(olss): :bug: sysprep: truncate resolv.conf Signed-off-by: Philippe Vanhaesendonck --- oracle-linux-image-tools/bin/build-image.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/oracle-linux-image-tools/bin/build-image.sh b/oracle-linux-image-tools/bin/build-image.sh index 6b9448c..6630631 100755 --- a/oracle-linux-image-tools/bin/build-image.sh +++ b/oracle-linux-image-tools/bin/build-image.sh @@ -486,6 +486,7 @@ image_cleanup() { virt-sysprep --delete "${BUILD_INFO}" \ --truncate /etc/machine-id \ + --truncate /etc/resolv.conf \ -a "${WORKSPACE}/${VM_NAME}/${VM_NAME}.qcow2" \ "${virt_sysprep_args[@]}" From 36d91d860cc774c95e130ee236c93d50bbe0f977 Mon Sep 17 00:00:00 2001 From: Philippe Vanhaesendonck Date: Mon, 27 May 2024 17:06:21 +0200 Subject: [PATCH 3/4] feat(olss): :sparkles: ol8u10 updates Signed-off-by: Philippe Vanhaesendonck --- oracle-linux-image-tools/README.md | 4 ++-- oracle-linux-image-tools/distr/ol8-aarch64/env.properties | 2 +- oracle-linux-image-tools/distr/ol8-slim/env.properties | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/oracle-linux-image-tools/README.md b/oracle-linux-image-tools/README.md index 5665f1c..8a40654 100755 --- a/oracle-linux-image-tools/README.md +++ b/oracle-linux-image-tools/README.md @@ -11,8 +11,8 @@ They currently support: - Distributions: - Oracle Linux 7 update 9 -- Slim (x86_64 only) - - Oracle Linux 8 update 9 -- Slim (x86_64 and aarch64) - - Oracle Linux 9 update 3 -- Slim (x86_64 and aarch64) + - Oracle Linux 8 update 10 -- Slim (x86_64 and aarch64) + - Oracle Linux 9 update 4 -- Slim (x86_64 and aarch64) - Clouds: - Microsoft Azure cloud (x86_64) Target packages: WALinuxAgent diff --git a/oracle-linux-image-tools/distr/ol8-aarch64/env.properties b/oracle-linux-image-tools/distr/ol8-aarch64/env.properties index 88df571..62f5292 100644 --- a/oracle-linux-image-tools/distr/ol8-aarch64/env.properties +++ b/oracle-linux-image-tools/distr/ol8-aarch64/env.properties @@ -3,7 +3,7 @@ # env file. # Distribution name -DISTR_NAME="OL8U9_aarch64" +DISTR_NAME="OL8U10_aarch64" # Distribution release readonly ORACLE_RELEASE=8 diff --git a/oracle-linux-image-tools/distr/ol8-slim/env.properties b/oracle-linux-image-tools/distr/ol8-slim/env.properties index 205b9cc..173be93 100644 --- a/oracle-linux-image-tools/distr/ol8-slim/env.properties +++ b/oracle-linux-image-tools/distr/ol8-slim/env.properties @@ -3,7 +3,7 @@ # env file. # Distribution name -DISTR_NAME="OL8U9_x86_64" +DISTR_NAME="OL8U10_x86_64" # Distribution release readonly ORACLE_RELEASE=8 From 98018dcf6c1fcdb02a252d49df8737188bb6adac Mon Sep 17 00:00:00 2001 From: Philippe Vanhaesendonck Date: Wed, 29 May 2024 11:40:32 +0200 Subject: [PATCH 4/4] fix(olss): :bug: pin kernel-core package. Avoid removal of kernel-core/kernel-uek-core as "unused dependency" when removing kernel/kernel-uek. Signed-off-by: Philippe Vanhaesendonck --- oracle-linux-image-tools/distr/ol8-aarch64/provision.sh | 1 + oracle-linux-image-tools/distr/ol8-slim/provision.sh | 1 + oracle-linux-image-tools/distr/ol9-aarch64/provision.sh | 1 + oracle-linux-image-tools/distr/ol9-slim/provision.sh | 1 + 4 files changed, 4 insertions(+) diff --git a/oracle-linux-image-tools/distr/ol8-aarch64/provision.sh b/oracle-linux-image-tools/distr/ol8-aarch64/provision.sh index 6eadda0..878b8b5 100644 --- a/oracle-linux-image-tools/distr/ol8-aarch64/provision.sh +++ b/oracle-linux-image-tools/distr/ol8-aarch64/provision.sh @@ -65,6 +65,7 @@ distr::kernel_config() { if [[ ${UEK_RELEASE} != 6 ]]; then if [[ ${KERNEL_MODULES,,} == "no" ]]; then common::echo_message "Removing kernel modules" + dnf mark install kernel-uek-core distr::remove_rpms kernel-uek-modules else common::echo_message "Ensure kernel modules are installed" diff --git a/oracle-linux-image-tools/distr/ol8-slim/provision.sh b/oracle-linux-image-tools/distr/ol8-slim/provision.sh index 234e192..1718900 100644 --- a/oracle-linux-image-tools/distr/ol8-slim/provision.sh +++ b/oracle-linux-image-tools/distr/ol8-slim/provision.sh @@ -69,6 +69,7 @@ distr::kernel_config() { if [[ ${KERNEL,,} = "uek" && ${UEK_RELEASE} != 6 ]]; then if [[ ${KERNEL_MODULES,,} == "no" ]]; then common::echo_message "Removing kernel modules" + dnf mark install kernel-uek-core distr::remove_rpms kernel-uek-modules else common::echo_message "Ensure kernel modules are installed" diff --git a/oracle-linux-image-tools/distr/ol9-aarch64/provision.sh b/oracle-linux-image-tools/distr/ol9-aarch64/provision.sh index bc7cc95..a894959 100644 --- a/oracle-linux-image-tools/distr/ol9-aarch64/provision.sh +++ b/oracle-linux-image-tools/distr/ol9-aarch64/provision.sh @@ -65,6 +65,7 @@ distr::kernel_config() { if [[ ${KERNEL_MODULES,,} == "no" ]]; then common::echo_message "Removing kernel modules and linux firmware" + dnf mark install kernel-uek-core distr::remove_rpms kernel-uek-modules linux-firmware else common::echo_message "Ensure kernel modules are installed" diff --git a/oracle-linux-image-tools/distr/ol9-slim/provision.sh b/oracle-linux-image-tools/distr/ol9-slim/provision.sh index 515f451..ba6d37b 100644 --- a/oracle-linux-image-tools/distr/ol9-slim/provision.sh +++ b/oracle-linux-image-tools/distr/ol9-slim/provision.sh @@ -74,6 +74,7 @@ distr::kernel_config() { rm -rf /var/lib/dnf/* if [[ ${KERNEL_MODULES,,} == "no" ]]; then common::echo_message "Removing kernel modules and linux firmware" + dnf mark install "${kernel}-core" distr::remove_rpms "${kernel}-modules" linux-firmware else common::echo_message "Ensure kernel modules are installed"