Skip to content

Commit 73224d9

Browse files
Hayao0819Hayao0819
committed
Merge branch 'dev' into dev-stable
2 parents 967ac61 + 895a5f0 commit 73224d9

File tree

53 files changed

+322
-421
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+322
-421
lines changed

‎Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ ARCH_Pen4 := --arch pen4
99
FULLBUILD := -d -g -e -r 5 --noconfirm
1010
DEBUG_OPTION := --debug --log
1111
DEBUG := false
12-
FULL_x86_64 := xfce cinnamon i3 plasma gnome
12+
#FULL_x86_64 := xfce cinnamon i3 plasma gnome
13+
FULL_x86_64 := xfce i3 plasma
1314
FULL_i686 := xfce lxde
1415
FULL_Pen4 := xfce lxde
1516

‎build.sh

+25-8
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,16 @@ echo_blank(){ yes " " 2> /dev/null | head -n "${1}" | tr -d "\n"; }
7777
# cpコマンドのラッパー
7878
_cp(){ cp -af --no-preserve=ownership,mode -- "${@}"; }
7979

80+
# gitコマンドのラッパー
81+
# https://stackoverflow.com/questions/71901632/fatal-unsafe-repository-home-repon-is-owned-by-someone-else
82+
# https://qiita.com/megane42/items/5375b54ea3570506e296
83+
git(){
84+
command git config --global safe.directory "$script_path"
85+
command git "$@"
86+
command git config --global --unset safe.directory "$script_path"
87+
}
88+
89+
8090
_usage () {
8191
cat "${script_path}/docs/build.sh/help.1"
8292
local blank="29" _arch _dirname _type _output _first
@@ -370,6 +380,12 @@ prepare_build() {
370380
modules=("${_modules[@]}")
371381
unset _modules
372382

383+
# Ignore modules
384+
local _m
385+
for _m in "${exclude_modules[@]}"; do
386+
readarray -t modules < <(printf "%s\n" "${modules[@]}" | grep -xv "${_m}")
387+
done
388+
373389
# Check modules
374390
module_check(){
375391
msg_debug -n "Checking ${1} module ... "
@@ -668,8 +684,8 @@ make_setup_mkinitcpio() {
668684
[[ "${boot_splash}" = true ]] && cp "${script_path}/mkinitcpio/mkinitcpio-archiso-plymouth.conf" "${airootfs_dir}/etc/mkinitcpio-archiso.conf"
669685

670686
if [[ "${gpg_key}" ]]; then
671-
gpg --export "${gpg_key}" >"${build_dir}/gpgkey"
672-
exec 17<>"${build_dir}/gpgkey"
687+
gpg --export "${gpg_key}" >"${build_dir}/gpgkey"
688+
exec 17<>"${build_dir}/gpgkey"
673689
fi
674690

675691
_chroot_run mkinitcpio -c "/etc/mkinitcpio-archiso.conf" -k "/boot/${kernel_filename}" -g "/boot/archiso.img"
@@ -726,10 +742,10 @@ make_syslinux() {
726742
# copy all syslinux config to work dir
727743
for _cfg in "${build_dir}/syslinux/"*.cfg; do
728744
sed "s|%ARCHISO_LABEL%|${iso_label}|g;
729-
s|%OS_NAME%|${os_name}|g;
730-
s|%KERNEL_FILENAME%|${kernel_filename}|g;
731-
s|%ARCH%|${arch}|g;
732-
s|%INSTALL_DIR%|${install_dir}|g" "${_cfg}" > "${isofs_dir}/syslinux/${_cfg##*/}"
745+
s|%OS_NAME%|${os_name}|g;
746+
s|%KERNEL_FILENAME%|${kernel_filename}|g;
747+
s|%ARCH%|${arch}|g;
748+
s|%INSTALL_DIR%|${install_dir}|g" "${_cfg}" > "${isofs_dir}/syslinux/${_cfg##*/}"
733749
done
734750

735751
# Replace the SYSLINUX configuration file with or without boot splash.
@@ -1149,7 +1165,8 @@ else
11491165
fi
11501166

11511167
# Set vars
1152-
build_dir="${work_dir}/build/${arch}" cache_dir="${work_dir}/cache/${arch}" airootfs_dir="${build_dir}/airootfs" isofs_dir="${build_dir}/iso" lockfile_dir="${build_dir}/lockfile" gitrev="$(cd "${script_path}"; git rev-parse --short HEAD)" preset_dir="${script_path}/presets"
1168+
build_dir="${work_dir}/build/${arch}" cache_dir="${work_dir}/cache/${arch}" airootfs_dir="${build_dir}/airootfs" isofs_dir="${build_dir}/iso" lockfile_dir="${build_dir}/lockfile" preset_dir="${script_path}/presets"
1169+
gitrev="$(cd "${script_path}"; git rev-parse --short HEAD)"
11531170

11541171
# Create dir
11551172
for _dir in build_dir cache_dir airootfs_dir isofs_dir lockfile_dir out_dir; do
@@ -1163,7 +1180,7 @@ if [[ -d "${channel_dir}.add" ]]; then
11631180
channel_name="${1}"
11641181
channel_dir="${channel_dir}.add"
11651182
elif [[ "${channel_name}" = "clean" ]]; then
1166-
_run_cleansh
1183+
_run_cleansh
11671184
exit 0
11681185
fi
11691186

‎channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ hinting='slight'
6666
app-picker-view=uint32 0
6767
disabled-extensions=['[email protected]', '[email protected]', 'screenshot-window-sizer@gnome-shell-extensions.gcampax.github.com', '[email protected]', '[email protected]', 'native-window-placement@gnome-shell-extensions.gcampax.github.com', '[email protected]', '[email protected]', '[email protected]']
6868
enabled-extensions=['[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]']
69-
favorite-apps=['chromium.desktop', 'org.gnome.Nautilus.desktop', 'thunderbird.desktop', 'libreoffice-startcenter.desktop', 'medit.desktop', 'vlc.desktop', 'org.gnome.Screenshot.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Extensions.desktop', 'gnome-control-center.desktop']
69+
favorite-apps=['chromium.desktop', 'org.gnome.Nautilus.desktop', 'thunderbird.desktop', 'libreoffice-startcenter.desktop', 'vlc.desktop', 'org.gnome.Screenshot.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Extensions.desktop', 'gnome-control-center.desktop']
7070

7171
[org/gnome/shell/extensions/arcmenu]
7272
application-shortcuts-list=[['Software', 'system-software-install-symbolic', 'ArcMenu_Software'], ['Settings', 'preferences-system-symbolic', 'gnome-control-center.desktop'], ['Tweaks', 'org.gnome.tweaks-symbolic', 'org.gnome.tweaks.desktop'], ['Terminal', 'utilities-terminal-symbolic', 'org.gnome.Terminal.desktop']]
@@ -89,7 +89,7 @@ menu-hotkey='Super_L'
8989
menu-layout='Windows'
9090
menu-width=290
9191
multi-monitor=true
92-
pinned-app-list=['Chromium', '', 'chromium.desktop', 'Thunderbird', '', 'thunderbird.desktop', 'LibreOffice Writer', '', 'libreoffice-writer.desktop', 'LibreOffice Impress', '', 'libreoffice-impress.desktop', 'LibreOffice Calc', '', 'libreoffice-calc.desktop', 'System Monitor', '', 'gnome-system-monitor.desktop', 'Extensions', '', 'org.gnome.Extensions.desktop', 'VLC media player', '', 'vlc.desktop', 'medit', '', 'medit.desktop']
92+
pinned-app-list=['Chromium', '', 'chromium.desktop', 'Thunderbird', '', 'thunderbird.desktop', 'LibreOffice Writer', '', 'libreoffice-writer.desktop', 'LibreOffice Impress', '', 'libreoffice-impress.desktop', 'LibreOffice Calc', '', 'libreoffice-calc.desktop', 'System Monitor', '', 'gnome-system-monitor.desktop', 'Extensions', '', 'org.gnome.Extensions.desktop', 'VLC media player', '', 'vlc.desktop']
9393
prefs-visible-page=0
9494
right-panel-width=205
9595
searchbar-default-bottom-location='Bottom'

‎channels/gnome/packages.i686/exclude

-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
xf86-input-synaptics
2-
alterlinux-medit-themes
3-
medit

‎channels/gnome/packages.pen4/exclude

-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
xf86-input-synaptics
2-
alterlinux-medit-themes
3-
medit

‎channels/gnome/packages.x86_64/exclude

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
xf86-input-synaptics
2-
alterlinux-medit-themes
3-
medit
2+

‎channels/i3/airootfs.any/root/customize_airootfs_i3.sh

+2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ for _dir in "/etc/skel/" "/home/${username}/"; do
4242
done
4343
done
4444

45+
chmod 755 "/usr/bin/alter-system-menu"
46+
4547
# disable light-locker on live
4648
sed -i "/light/s/^/# /g" "/home/${username}/.config/i3/config"
4749

‎channels/i3/packages.i686/i3.i686

-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ conky
2121
# launcher
2222
rofi
2323

24-
# terminal emulator
25-
sakura
26-
2724
# theme manager
2825
alterlinux-i3-manager
2926

‎channels/i3/packages.x86_64/i3.x86_64

-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ conky
2121
# launcher
2222
rofi
2323

24-
# terminal emulator
25-
sakura
26-
2724
# theme manager
2825
alterlinux-i3-manager
2926

‎channels/i3/packages_aur.i686/i3.i686

+3
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@
1111

1212
# i3wm
1313
polybar
14+
15+
# terminal emulator
16+
sakura

‎channels/i3/packages_aur.x86_64/i3.x86_64

+3
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@
1111

1212
# i3wm
1313
polybar
14+
15+
# terminal emulator
16+
sakura

‎channels/releng/airootfs.any/etc/systemd/system/[email protected]/autologin.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[Service]
22
ExecStart=
3-
ExecStart=-/sbin/agetty --autologin root --noclear %I 38400 linux
3+
ExecStart=-/sbin/agetty -o '-p -f -- \\u' --noclear --autologin root - $TERM

‎channels/releng/airootfs.any/etc/systemd/system/pacman-init.service

-15
This file was deleted.

‎channels/releng/airootfs.any/root/customize_airootfs.sh

+4
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ cp -aT /etc/skel/ /root/
8181
sed -i 's/#\(PermitRootLogin \).\+/\1yes/' /etc/ssh/sshd_config
8282
sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist
8383

84+
if [[ -e "/root/.automated_script.sh" ]]; then
85+
chmod 755 "/root/.automated_script.sh"
86+
fi
87+
8488
# Enable services.
8589
systemctl enable NetworkManager
8690
systemctl enable pacman-init.service

‎channels/releng/alteriso

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
alteriso=3.0
1+
alteriso=3.1

‎channels/releng/config.any

+8-19
Original file line numberDiff line numberDiff line change
@@ -76,23 +76,12 @@ nochname=true
7676
# List of packages required for build
7777
# The following packages are checked to see if they are installed before running build.sh
7878
# Also, wizard.sh will install it automatically.
79-
dependence=(
80-
# "alterlinux-keyring"
81-
# "archiso"
82-
"arch-install-scripts"
83-
"curl"
84-
"dosfstools"
85-
"edk2-shell"
86-
"git"
87-
"libburn"
88-
"libisofs"
89-
"lz4"
90-
"lzo"
91-
"make"
92-
"squashfs-tools"
93-
"libisoburn"
94-
# "lynx"
95-
"xz"
96-
"zlib"
97-
"zstd"
79+
readarray -t dependence < <(printf "%s\n" "${dependence[@]}" | grep -xv "alterlinux-keyring")
80+
81+
# Modules to include
82+
# An array of module directory names to include.
83+
# This setting cannot be changed by an argument.
84+
modules=(
85+
base
86+
share
9887
)

‎channels/releng/pacman-i686.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ HoldPkg = pacman glibc
1919
#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
2020
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
2121
#CleanMethod = KeepInstalled
22-
Architecture = i486
22+
Architecture = i686
2323

2424
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
2525
#IgnorePkg =

‎channels/releng/pacman-x86_64.conf

+22-36
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ HoldPkg = pacman glibc
1919
#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
2020
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
2121
#CleanMethod = KeepInstalled
22-
Architecture = i486
22+
Architecture = x86_64
2323

2424
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
2525
#IgnorePkg =
@@ -70,70 +70,56 @@ LocalFileSigLevel = Optional
7070
# after the header, and they will be used before the default mirrors.
7171

7272
#[testing]
73-
#Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
74-
#Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch
75-
#Server = http://mirror.archlinux.jp/$repo/os/$arch
76-
#Server = https://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
7773
#Server = http://mirrors.cat.net/archlinux/$repo/os/$arch
7874
#Server = https://mirrors.cat.net/archlinux/$repo/os/$arch
79-
#Server = https://jpn.mirror.pkgbuild.com/$repo/os/$arch
75+
#Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch
76+
#Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
77+
#Server = https://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
8078

8179
[core]
82-
Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
83-
Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch
84-
Server = http://mirror.archlinux.jp/$repo/os/$arch
85-
Server = https://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
8680
Server = http://mirrors.cat.net/archlinux/$repo/os/$arch
8781
Server = https://mirrors.cat.net/archlinux/$repo/os/$arch
88-
Server = https://jpn.mirror.pkgbuild.com/$repo/os/$arch
89-
90-
[extra]
91-
Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
9282
Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch
93-
Server = http://mirror.archlinux.jp/$repo/os/$arch
83+
Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
9484
Server = https://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
85+
86+
[extra]
9587
Server = http://mirrors.cat.net/archlinux/$repo/os/$arch
9688
Server = https://mirrors.cat.net/archlinux/$repo/os/$arch
97-
Server = https://jpn.mirror.pkgbuild.com/$repo/os/$arch
89+
Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch
90+
Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
91+
Server = https://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
9892

9993
#[community-testing]
100-
#Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
101-
#Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch
102-
#Server = http://mirror.archlinux.jp/$repo/os/$arch
103-
#Server = https://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
10494
#Server = http://mirrors.cat.net/archlinux/$repo/os/$arch
10595
#Server = https://mirrors.cat.net/archlinux/$repo/os/$arch
106-
#Server = https://jpn.mirror.pkgbuild.com/$repo/os/$arch
96+
#Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch
97+
#Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
98+
#Server = https://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
10799

108100
[community]
109-
Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
110-
Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch
111-
Server = http://mirror.archlinux.jp/$repo/os/$arch
112-
Server = https://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
113101
Server = http://mirrors.cat.net/archlinux/$repo/os/$arch
114102
Server = https://mirrors.cat.net/archlinux/$repo/os/$arch
115-
Server = https://jpn.mirror.pkgbuild.com/$repo/os/$arch
103+
Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch
104+
Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
105+
Server = https://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
116106

117107
# If you want to run 32 bit applications on your x86_64 system,
118108
# enable the multilib repositories as required here.
119109

120110
#[multilib-testing]
121-
#Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
122-
#Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch
123-
#Server = http://mirror.archlinux.jp/$repo/os/$arch
124-
#Server = https://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
125111
#Server = http://mirrors.cat.net/archlinux/$repo/os/$arch
126112
#Server = https://mirrors.cat.net/archlinux/$repo/os/$arch
127-
#Server = https://jpn.mirror.pkgbuild.com/$repo/os/$arch
113+
#Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch
114+
#Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
115+
##Server = https://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
128116

129117
[multilib]
130-
Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
131-
Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch
132-
Server = http://mirror.archlinux.jp/$repo/os/$arch
133-
Server = https://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
134118
Server = http://mirrors.cat.net/archlinux/$repo/os/$arch
135119
Server = https://mirrors.cat.net/archlinux/$repo/os/$arch
136-
Server = https://jpn.mirror.pkgbuild.com/$repo/os/$arch
120+
Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch
121+
Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
122+
Server = https://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
137123

138124
# This is Yamada Hayao's personal repository.
139125
# It was used early but is now disabled.

0 commit comments

Comments
 (0)