OSDN -- Développer et télécharger des logiciels Open Source
Traduction statut du Français translation status for fr
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

alterlinux: Commit

GitHubのミラーです
https://github.com/FascodeNet/alterlinux


Commit MetaInfo

Révision19e5c49c7e58a36ddab489b73b41a725d0f76fe3 (tree)
l'heure2020-10-01 21:52:16
Auteurhayao <shun819.mail@gmai...>
Commiterhayao

Message de Log

Merge branch 'stable'

Change Summary

Modification

--- a/build.sh
+++ b/build.sh
@@ -911,7 +911,7 @@ make_customize_airootfs() {
911911
912912 # /root permission
913913 # https://github.com/archlinux/archiso/commit/d39e2ba41bf556674501062742190c29ee11cd59
914- chmod -f 750 "${work_dir}/x86_64/airootfs/root"
914+ chmod -f 750 "${work_dir}/${arch}/airootfs/root"
915915 }
916916
917917 # Copy mkinitcpio archiso hooks and build initramfs (airootfs)
@@ -1040,7 +1040,10 @@ make_isolinux() {
10401040 # Prepare /EFI
10411041 make_efi() {
10421042 mkdir -p "${work_dir}/iso/EFI/boot"
1043- cp "${work_dir}/${arch}/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi" "${work_dir}/iso/EFI/boot/bootx64.efi"
1043+ (
1044+ local __bootfile="$(basename "$(ls "${work_dir}/${arch}/airootfs/usr/lib/systemd/boot/efi/systemd-boot"*".efi" )")"
1045+ cp "${work_dir}/${arch}/airootfs/usr/lib/systemd/boot/efi/${__bootfile}" "${work_dir}/iso/EFI/boot/${__bootfile#systemd-}"
1046+ )
10441047
10451048 mkdir -p "${work_dir}/iso/loader/entries"
10461049 cp "${script_path}/efiboot/loader/loader.conf" "${work_dir}/iso/loader/"
@@ -1052,13 +1055,15 @@ make_efi() {
10521055
10531056 # edk2-shell based UEFI shell
10541057 # shellx64.efi is picked up automatically when on /
1055- cp "${work_dir}/x86_64/airootfs/usr/share/edk2-shell/x64/Shell_Full.efi" "${work_dir}/iso/shellx64.efi"
1058+ if [[ -f "${work_dir}/${arch}/airootfs/usr/share/edk2-shell/x64/Shell_Full.efi" ]]; then
1059+ cp "${work_dir}/${arch}/airootfs/usr/share/edk2-shell/x64/Shell_Full.efi" "${work_dir}/iso/shellx64.efi"
1060+ fi
10561061 }
10571062
10581063 # Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
10591064 make_efiboot() {
10601065 mkdir -p "${work_dir}/iso/EFI/archiso"
1061- truncate -s 64M "${work_dir}/iso/EFI/archiso/efiboot.img"
1066+ truncate -s 100M "${work_dir}/iso/EFI/archiso/efiboot.img"
10621067 mkfs.fat -n ARCHISO_EFI "${work_dir}/iso/EFI/archiso/efiboot.img"
10631068
10641069 mkdir -p "${work_dir}/efiboot"
@@ -1078,7 +1083,10 @@ make_efiboot() {
10781083 cp "${work_dir}/iso/${install_dir}/boot/amd_ucode.img" "${work_dir}/efiboot/EFI/archiso/amd_ucode.img"
10791084
10801085 mkdir -p "${work_dir}/efiboot/EFI/boot"
1081- cp "${work_dir}/${arch}/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi" "${work_dir}/efiboot/EFI/boot/bootx64.efi"
1086+ (
1087+ local __bootfile="$(basename "$(ls "${work_dir}/${arch}/airootfs/usr/lib/systemd/boot/efi/systemd-boot"*".efi" )")"
1088+ cp "${work_dir}/${arch}/airootfs/usr/lib/systemd/boot/efi/${__bootfile}" "${work_dir}/iso/EFI/boot/${__bootfile#systemd-}"
1089+ )
10821090
10831091 mkdir -p "${work_dir}/efiboot/loader/entries"
10841092 cp "${script_path}/efiboot/loader/loader.conf" "${work_dir}/efiboot/loader/"
@@ -1090,7 +1098,9 @@ make_efiboot() {
10901098 "${script_path}/efiboot/loader/entries/cd/archiso-x86_64-cd-${kernel}.conf" > "${work_dir}/efiboot/loader/entries/archiso-x86_64.conf"
10911099
10921100 # shellx64.efi is picked up automatically when on /
1093- cp "${work_dir}/iso/shellx64.efi" "${work_dir}/efiboot/"
1101+ if [[ -f "${work_dir}/iso/shellx64.efi" ]]; then
1102+ cp "${work_dir}/iso/shellx64.efi" "${work_dir}/efiboot/"
1103+ fi
10941104
10951105 umount -d "${work_dir}/efiboot"
10961106 }
--- a/channels/cinnamon/packages.i686/other.i686
+++ b/channels/cinnamon/packages.i686/other.i686
@@ -14,6 +14,7 @@ xarchiver
1414
1515
1616 #-- GVFS --#
17+smbclient
1718 gvfs
1819 gvfs-smb
1920
--- a/channels/cinnamon/packages.x86_64/other.x86_64
+++ b/channels/cinnamon/packages.x86_64/other.x86_64
@@ -14,6 +14,7 @@ xarchiver
1414
1515
1616 #-- GVFS --#
17+smbclient
1718 gvfs
1819 gvfs-smb
1920
--- a/channels/i3/packages.i686/packages.i686
+++ b/channels/i3/packages.i686/packages.i686
@@ -28,6 +28,7 @@ smartmontools
2828 testdisk
2929 vim-minimal
3030 grub-theme-vimix
31+smbclient
3132 gvfs-smb
3233 gvfs
3334 sshfs
--- a/channels/i3/packages.x86_64/packages.x86_64
+++ b/channels/i3/packages.x86_64/packages.x86_64
@@ -28,6 +28,7 @@ smartmontools
2828 testdisk
2929 vim-minimal
3030 grub-theme-vimix
31+smbclient
3132 gvfs-smb
3233 gvfs
3334 sshfs
--- a/channels/lxde/packages.i686/other.i686
+++ b/channels/lxde/packages.i686/other.i686
@@ -14,6 +14,7 @@ xarchiver
1414
1515
1616 #-- GVFS --#
17+smbclient
1718 gvfs
1819 gvfs-smb
1920
--- a/channels/lxde/packages.x86_64/other.x86_64
+++ b/channels/lxde/packages.x86_64/other.x86_64
@@ -14,6 +14,7 @@ xarchiver
1414
1515
1616 #-- GVFS --#
17+smbclient
1718 gvfs
1819 gvfs-smb
1920
--- a/channels/xfce/packages.i686/other.i686
+++ b/channels/xfce/packages.i686/other.i686
@@ -14,6 +14,7 @@ xarchiver
1414
1515
1616 #-- GVFS --#
17+smbclient
1718 gvfs
1819 gvfs-smb
1920
--- a/channels/xfce/packages.x86_64/other.x86_64
+++ b/channels/xfce/packages.x86_64/other.x86_64
@@ -14,6 +14,7 @@ xarchiver
1414
1515
1616 #-- GVFS --#
17+smbclient
1718 gvfs
1819 gvfs-smb
1920
--- a/fullbuild.sh
+++ b/fullbuild.sh
@@ -162,19 +162,31 @@ trap_exit() {
162162
163163
164164 build() {
165+ local _exit_code=0
166+
165167 options="${share_options} -a ${arch} ${cha}"
166168
167169 if [[ ! -e "${work_dir}/fullbuild.${cha}_${arch}" ]]; then
168170 _msg_info "Build ${cha} with ${arch} architecture."
169171 sudo bash ${script_path}/build.sh ${options}
170- touch "${work_dir}/fullbuild.${cha}_${arch}"
172+ _exit_code="${?}"
173+ if [[ "${_exit_code}" = 0 ]]; then
174+ touch "${work_dir}/fullbuild.${cha}_${arch}"
175+ else
176+ _msg_error "build.sh finished with exit code ${_exit_code}. Will try again."
177+ fi
171178 fi
172179 sudo pacman -Sccc --noconfirm > /dev/null 2>&1
173180
174181 if [[ ! -e "${work_dir}/fullbuild.${cha}_${arch}_jp" ]]; then
175182 _msg_info "Build the Japanese version of ${cha} on the ${arch} architecture."
176183 sudo bash ${script_path}/build.sh -j ${options}
177- touch "${work_dir}/fullbuild.${cha}_${arch}_jp"
184+ _exit_code="${?}"
185+ if [[ "${_exit_code}" = 0 ]]; then
186+ touch "${work_dir}/fullbuild.${cha}_${arch}_jp"
187+ else
188+ _msg_error "build.sh finished with exit code ${_exit_code}. Will try again."
189+ fi
178190 fi
179191 sudo pacman -Sccc --noconfirm > /dev/null 2>&1
180192 }
@@ -207,7 +219,7 @@ _help() {
207219 share_options="--noconfirm"
208220 default_options="-b -l -u alter -p alter"
209221
210-while getopts 'a:dghr:sc' arg; do
222+while getopts 'a:dghr:scm:' arg; do
211223 case "${arg}" in
212224 a) share_options="${share_options} ${OPTARG}" ;;
213225 c) all_channel=true ;;
Afficher sur ancien navigateur de dépôt.