Skip to content

Commit f02bdc9

Browse files
spiritLHLSspiritLHLS
authored
Update build_images.sh
1 parent 725494d commit f02bdc9

File tree

1 file changed

+60
-59
lines changed

1 file changed

+60
-59
lines changed

‎build_images.sh

Lines changed: 60 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -73,64 +73,64 @@ build_or_list_images() {
7373
ver_num=${ver_nums[i]}
7474
for arch in "${architectures[@]}"; do
7575
for variant in "${variants[@]}"; do
76-
if [ "$is_build_image" == true ]; then
77-
EXTRA_ARGS=""
78-
if [[ "$run_funct" == "oracle" && "$version" == "9" ]]; then
79-
EXTRA_ARGS="-o source.url=https://yum.oracle.com/ISOS/OracleLinux"
80-
elif [[ "$run_funct" == "centos" ]]; then
81-
if [ "$version" = "7" ] && [ "${arch}" != "amd64" ] && [ "${arch}" != "x86_64" ]; then
82-
EXTRA_ARGS="-o source.url=http://mirror.math.princeton.edu/pub/centos-altarch/ -o source.skip_verification=true"
83-
fi
84-
if [ "$version" = "8-Stream" ] || [ "$version" = "9-Stream" ]; then
85-
EXTRA_ARGS="${EXTRA_ARGS} -o source.variant=boot"
86-
fi
87-
if [ "$version" = "9-Stream" ]; then
88-
EXTRA_ARGS="${EXTRA_ARGS} -o source.url=https://mirror1.hs-esslingen.de/pub/Mirrors/centos-stream"
89-
fi
90-
elif [[ "$run_funct" == "archlinux" ]]; then
91-
if [ "${arch}" != "amd64" ] && [ "${arch}" != "i386" && [ "${arch}" != "x86_64" ]; then
92-
EXTRA_ARGS="-o source.url=http://os.archlinuxarm.org"
93-
fi
94-
elif [[ "$run_funct" == "alpine" ]]; then
95-
EXTRA_ARGS="-o source.same_as=3.19"
96-
elif [[ "$run_funct" == "rockylinux" ]]; then
97-
EXTRA_ARGS="-o source.variant=boot"
98-
elif [[ "$run_funct" == "almalinux" ]]; then
99-
EXTRA_ARGS="-o source.variant=boot"
100-
elif [[ "$run_funct" == "ubuntu" ]]; then
101-
if [ "${arch}" != "amd64" ] && [ "${arch}" != "i386" && [ "${arch}" != "x86_64" ]; then
102-
EXTRA_ARGS="-o source.url=http://ports.ubuntu.com/ubuntu-ports"
103-
fi
104-
elif [[ "$run_funct" == "gentoo" ]]; then
105-
if [ "${variant}" = "cloud" ]; then
106-
EXTRA_ARGS="-o source.variant=openrc"
107-
else
108-
EXTRA_ARGS="-o source.variant=${variant}"
109-
fi
110-
[ "${arch}" = "x86_64" ] && arch="amd64"
111-
elif [[ "$run_funct" == "fedora" ]]; then
112-
[ "${arch}" = "amd64" ] && arch="x86_64"
113-
[ "${arch}" = "arm64" ] && arch="aarch64"
76+
EXTRA_ARGS=""
77+
if [[ "$run_funct" == "oracle" && "$version" == "9" ]]; then
78+
EXTRA_ARGS="-o source.url=https://yum.oracle.com/ISOS/OracleLinux"
79+
elif [[ "$run_funct" == "centos" ]]; then
80+
if [ "$version" = "7" ] && [ "${arch}" != "amd64" ] && [ "${arch}" != "x86_64" ]; then
81+
EXTRA_ARGS="-o source.url=http://mirror.math.princeton.edu/pub/centos-altarch/ -o source.skip_verification=true"
82+
fi
83+
if [ "$version" = "8-Stream" ] || [ "$version" = "9-Stream" ]; then
84+
EXTRA_ARGS="${EXTRA_ARGS} -o source.variant=boot"
85+
fi
86+
if [ "$version" = "9-Stream" ]; then
87+
EXTRA_ARGS="${EXTRA_ARGS} -o source.url=https://mirror1.hs-esslingen.de/pub/Mirrors/centos-stream"
88+
fi
89+
elif [[ "$run_funct" == "archlinux" ]]; then
90+
if [ "${arch}" != "amd64" ] && [ "${arch}" != "i386" && [ "${arch}" != "x86_64" ]; then
91+
EXTRA_ARGS="-o source.url=http://os.archlinuxarm.org"
11492
fi
115-
# apk apt dnf egoportage opkg pacman portage yum equo xbps zypper luet slackpkg
116-
if [[ "$run_funct" == "centos" || "$run_funct" == "fedora" ]]; then
117-
manager="yum"
118-
elif [[ "$run_funct" == "kali" || "$run_funct" == "ubuntu" || "$run_funct" == "debian" ]]; then
119-
manager="apt"
120-
elif [[ "$run_funct" == "almalinux" || "$run_funct" == "rockylinux" || "$run_funct" == "oracle" ]]; then
121-
manager="dnf"
122-
elif [[ "$run_funct" == "archlinux" ]]; then
123-
manager="pacman"
124-
elif [[ "$run_funct" == "alpine" ]]; then
125-
manager="apk"
126-
elif [[ "$run_funct" == "openwrt" ]]; then
127-
manager="opkg"
128-
elif [[ "$run_funct" == "gentoo" ]]; then
129-
manager="portage"
93+
elif [[ "$run_funct" == "alpine" ]]; then
94+
EXTRA_ARGS="-o source.same_as=3.19"
95+
elif [[ "$run_funct" == "rockylinux" ]]; then
96+
EXTRA_ARGS="-o source.variant=boot"
97+
elif [[ "$run_funct" == "almalinux" ]]; then
98+
EXTRA_ARGS="-o source.variant=boot"
99+
elif [[ "$run_funct" == "ubuntu" ]]; then
100+
if [ "${arch}" != "amd64" ] && [ "${arch}" != "i386" && [ "${arch}" != "x86_64" ]; then
101+
EXTRA_ARGS="-o source.url=http://ports.ubuntu.com/ubuntu-ports"
102+
fi
103+
elif [[ "$run_funct" == "gentoo" ]]; then
104+
if [ "${variant}" = "cloud" ]; then
105+
EXTRA_ARGS="-o source.variant=openrc"
130106
else
131-
echo "Unsupported distribution: $run_funct"
132-
exit 1
107+
EXTRA_ARGS="-o source.variant=${variant}"
133108
fi
109+
[ "${arch}" = "x86_64" ] && arch="amd64"
110+
elif [[ "$run_funct" == "fedora" ]]; then
111+
[ "${arch}" = "amd64" ] && arch="x86_64"
112+
[ "${arch}" = "arm64" ] && arch="aarch64"
113+
fi
114+
# apk apt dnf egoportage opkg pacman portage yum equo xbps zypper luet slackpkg
115+
if [[ "$run_funct" == "centos" || "$run_funct" == "fedora" ]]; then
116+
manager="yum"
117+
elif [[ "$run_funct" == "kali" || "$run_funct" == "ubuntu" || "$run_funct" == "debian" ]]; then
118+
manager="apt"
119+
elif [[ "$run_funct" == "almalinux" || "$run_funct" == "rockylinux" || "$run_funct" == "oracle" ]]; then
120+
manager="dnf"
121+
elif [[ "$run_funct" == "archlinux" ]]; then
122+
manager="pacman"
123+
elif [[ "$run_funct" == "alpine" ]]; then
124+
manager="apk"
125+
elif [[ "$run_funct" == "openwrt" ]]; then
126+
manager="opkg"
127+
elif [[ "$run_funct" == "gentoo" ]]; then
128+
manager="portage"
129+
else
130+
echo "Unsupported distribution: $run_funct"
131+
exit 1
132+
fi
133+
if [ "$is_build_image" == true ]; then
134134
if [[ "$run_funct" == "gentoo" ]]; then
135135
echo "sudo distrobuilder build-incus "${opath}/images_yaml/${run_funct}.yaml" -o image.architecture=${arch} -o image.variant=${variant} ${EXTRA_ARGS}"
136136
if sudo distrobuilder build-incus "${opath}/images_yaml/${run_funct}.yaml" -o image.architecture=${arch} -o image.variant=${variant} ${EXTRA_ARGS}; then
@@ -148,19 +148,20 @@ build_or_list_images() {
148148
fi
149149
fi
150150
if [[ "$run_funct" == "gentoo" ]]; then
151-
if [ "${variant}" = "openrc" ]; then
152-
variant="cloud"
153-
fi
154151
[ "${arch}" = "amd64" ] && arch="x86_64"
155152
elif [[ "$run_funct" == "fedora" ]]; then
156-
[ "${arch}" = "x86_64" ] && arch="amd64"
157153
[ "${arch}" = "aarch64" ] && arch="arm64"
158154
fi
159155
if [ -f incus.tar.xz ] && [ -f rootfs.squashfs ]; then
160156
zip "${run_funct}_${ver_num}_${version}_${arch}_${variant}.zip" incus.tar.xz rootfs.squashfs
161157
rm -rf incus.tar.xz rootfs.squashfs
162158
fi
163159
else
160+
if [[ "$run_funct" == "gentoo" ]]; then
161+
[ "${arch}" = "amd64" ] && arch="x86_64"
162+
elif [[ "$run_funct" == "fedora" ]]; then
163+
[ "${arch}" = "aarch64" ] && arch="arm64"
164+
fi
164165
zip_name_list+=("${run_funct}_${ver_num}_${version}_${arch}_${variant}.zip")
165166
fi
166167
done

0 commit comments

Comments
 (0)