From 40233a320099544c3bc207ec78b198d6f7ec5ec7 Mon Sep 17 00:00:00 2001 From: linwenkai <941116795@qq.com> Date: Tue, 4 Dec 2018 02:13:33 +0100 Subject: [PATCH 1/3] use git fetch to replace git pull Remove apparmor after installation Signed-off-by: linwenkai <941116795@qq.com> --- build.sh | 2 +- submodules/debian-build-installer.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index e3decc0d..571f616d 100755 --- a/build.sh +++ b/build.sh @@ -264,7 +264,7 @@ for module in $module_name; do fi done else - (cd ${module} ; git pull || true) + (cd ${module} ; git fetch origin ${version} || true) fi cd ${top_dir} if [ x"$module" = x"estuary-uefi" ]; then diff --git a/submodules/debian-build-installer.sh b/submodules/debian-build-installer.sh index b3aad9d4..ce0b15f1 100755 --- a/submodules/debian-build-installer.sh +++ b/submodules/debian-build-installer.sh @@ -87,6 +87,7 @@ d-i anna/no_kernel_modules boolean true # Skip linux-image-arm64 installation d-i base-installer/kernel/image string none +d-i preseed/late_command string in-target apt-get remove -y apparmor EOF From 6b439e95cefbd258f50763a393d9b2d2b680412f Mon Sep 17 00:00:00 2001 From: linwenkai <941116795@qq.com> Date: Sat, 15 Dec 2018 10:14:19 +0100 Subject: [PATCH 2/3] Fix centos fails to get ip. Signed-off-by: linwenkai <941116795@qq.com> --- configs/auto-install/centos/auto-iso/ks-iso.cfg | 2 +- configs/auto-install/centos/auto-pxe/ks.cfg | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configs/auto-install/centos/auto-iso/ks-iso.cfg b/configs/auto-install/centos/auto-iso/ks-iso.cfg index f6ee8965..7a12a868 100644 --- a/configs/auto-install/centos/auto-iso/ks-iso.cfg +++ b/configs/auto-install/centos/auto-iso/ks-iso.cfg @@ -1,4 +1,4 @@ -network --bootproto=dhcp --device=eth0 --ipv6=auto --no-activate +network --bootproto=dhcp --onboot=yes --ipv6=auto --activate %packages bash-completion diff --git a/configs/auto-install/centos/auto-pxe/ks.cfg b/configs/auto-install/centos/auto-pxe/ks.cfg index 5533ed2a..12c08274 100644 --- a/configs/auto-install/centos/auto-pxe/ks.cfg +++ b/configs/auto-install/centos/auto-pxe/ks.cfg @@ -1,9 +1,7 @@ url --url="http://mirror.centos.org/altarch/7/os/aarch64/" repo --name="estuary" --baseurl=ftp://repoftp:repopushez7411@117.78.41.188/releases/5.2/centos repo --name="extras" --baseurl="http://mirror.centos.org/altarch/7/extras/aarch64/" -network --bootproto=dhcp --device=eth0 --ipv6=auto --no-activate - - +network --bootproto=dhcp --onboot=yes --ipv6=auto --activate %packages bash-completion From b3a46b13cc6b623f88fb5f0290aed2658b1e20b2 Mon Sep 17 00:00:00 2001 From: linwenkai <941116795@qq.com> Date: Mon, 17 Dec 2018 12:02:29 +0100 Subject: [PATCH 3/3] Fix centos gpg key import failed Signed-off-by: linwenkai <941116795@qq.com> --- configs/auto-install/centos/auto-iso/ks-iso.cfg | 3 ++- configs/auto-install/centos/auto-pxe/ks.cfg | 3 ++- submodules/centos-build-iso.sh | 5 +---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/configs/auto-install/centos/auto-iso/ks-iso.cfg b/configs/auto-install/centos/auto-iso/ks-iso.cfg index 7a12a868..413687b6 100644 --- a/configs/auto-install/centos/auto-iso/ks-iso.cfg +++ b/configs/auto-install/centos/auto-iso/ks-iso.cfg @@ -14,14 +14,15 @@ name=Estuary baseurl=${estuary_release}/5.0/centos/ enabled=1 gpgcheck=1 +gpgkey=${estuary_release}/ESTUARY-GPG-KEY [estuary-kernel] name=estuary-kernel baseurl=${estuary_release}/5.2/centos/ enabled=1 gpgcheck=1 +gpgkey=${estuary_release}/ESTUARY-GPG-KEY EOF chmod +r /etc/yum.repos.d/estuary.repo -rpm --import ${estuary_release}/ESTUARY-GPG-KEY yum clean dbcache %end diff --git a/configs/auto-install/centos/auto-pxe/ks.cfg b/configs/auto-install/centos/auto-pxe/ks.cfg index 12c08274..dbdf5594 100644 --- a/configs/auto-install/centos/auto-pxe/ks.cfg +++ b/configs/auto-install/centos/auto-pxe/ks.cfg @@ -17,14 +17,15 @@ name=Estuary baseurl=${estuary_release}/5.0/centos/ enabled=1 gpgcheck=1 +gpgkey=${estuary_release}/ESTUARY-GPG-KEY [estuary-kernel] name=estuary-kernel baseurl=${estuary_release}/5.2/centos/ enabled=1 gpgcheck=1 +gpgkey=${estuary_release}/ESTUARY-GPG-KEY EOF chmod +r /etc/yum.repos.d/estuary.repo -rpm --import ${estuary_release}/ESTUARY-GPG-KEY yum clean dbcache %end diff --git a/submodules/centos-build-iso.sh b/submodules/centos-build-iso.sh index 361c768f..807ef238 100755 --- a/submodules/centos-build-iso.sh +++ b/submodules/centos-build-iso.sh @@ -28,9 +28,6 @@ if [ ! -f $ISO ] || ! check_sum . ${ISO}.sum; then check_sum . ${ISO}.sum || exit 1 fi -# Create a working directory for your customized media. -mkdir -p ${dest_dir}/temp - # Copy the source media to the working directory. xorriso -osirrox on -indev ${ISO} -extract / ${dest_dir} @@ -103,6 +100,6 @@ if [ x"$build_kernel" != x"true" ]; then EFI/BOOT=${dest_dir}/EFI/BOOT \ images/efiboot.img=${dest_dir}/images/efiboot.img cd ${dest_dir} - rm -rf Packages repodata temp + rm -rf Packages repodata tar -cf - . | pigz > ${out}/centos-netboot-${version}.tar.gz fi