Skip to content

Commit fb5d80c

Browse files
committed
Merge branch 'dev' into dev-stable
2 parents dc1024f + 9e20240 commit fb5d80c

23 files changed

+375
-239
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,5 @@ menuconfig-script/kernel_choice_*
2626
/out/
2727
out
2828
/pacman-*.conf
29+
.config
30+
menuconfig-script/channels_menuconfig-*

.shellcheckrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
shell=bash
22
disable=SC1090
3+
disable=SC1091
34
disable=SC2154
45
disable=SC2016
56
disable=SC2034

Makefile

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,38 @@ KERNEL := zen
55
SHARE_OPTION := --boot-splash --comp-type "xz" --user "alter" --password "alter" --kernel "${KERNEL}" --debug --noconfirm
66
ARCH_x86_64 := --arch x86_64
77
ARCH_i686 := --arch i686
8-
FULLBUILD := -d -g -e 1 --noconfirm
8+
FULLBUILD := -d -g -e --noconfirm
99
FULL_x86_64 := xfce cinnamon i3 plasma
1010
FULL_i686 := xfce lxde
1111
CURRENT_DIR := ${shell dirname $(dir $(abspath $(lastword $(MAKEFILE_LIST))))}/${shell basename $(dir $(abspath $(lastword $(MAKEFILE_LIST))))}
1212

1313
full:
14-
@sudo ${CURRENT_DIR}/tools/fullbuild.sh ${FULLBUILD} -m x86_64 ${FULL_x86_64}
15-
@sudo ${CURRENT_DIR}/tools/fullbuild.sh ${FULLBUILD} -m i686 ${FULL_i686}
14+
sudo ${CURRENT_DIR}/tools/fullbuild.sh ${FULLBUILD} -m x86_64 ${FULL_x86_64}
15+
sudo ${CURRENT_DIR}/tools/fullbuild.sh ${FULLBUILD} -m i686 ${FULL_i686}
1616
@make clean
1717

1818
basic-64 basic-32 cinnamon-64 cinnamon-32 gnome-64 i3-64 i3-32 lxde-64 lxde-32 plasma-64 releng-32 releng-64 serene-64 serene-32 xfce-64 xfce-32 xfce-pro-64:
19-
$(eval CHANNEL=${shell echo ${@} | cut -d '-' -f 1})
20-
$(eval ARCHITECTURE=${shell echo ${@} | cut -d '-' -f 2})
19+
@$(eval ARCHITECTURE=${shell echo ${@} | rev | cut -d '-' -f 1 | rev })
20+
@$(eval CHANNEL=${shell echo ${@} | sed "s/-${ARCHITECTURE}//g"})
21+
@[[ -z "${CHANNEL}" ]] && echo "Empty Channel" && exit 1 || :
2122
@case ${ARCHITECTURE} in\
2223
"32") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${ARGS} ${SHARE_OPTION} ${ARCH_i686} ${CHANNEL} ;;\
2324
"64") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${ARGS} ${SHARE_OPTION} ${ARCH_x86_64} ${CHANNEL};;\
25+
* ) echo "Unknown Architecture"; exit 1 ;; \
2426
esac
2527
@make clean
2628

2729
menuconfig/build/mconf::
2830
@mkdir -p menuconfig/build
2931
(cd menuconfig/build ; cmake -GNinja .. ; ninja -j4 )
3032

31-
menuconfig:menuconfig/build/mconf menuconfig-script/kernel_choice
33+
menuconfig:menuconfig/build/mconf menuconfig-script/kernel_choice menuconfig-script/channel_choice
3234
@menuconfig/build/mconf menuconfig-script/rootconf
3335

3436
menuconfig-script/kernel_choice:system/kernel-x86_64 system/kernel-i686
3537
@${CURRENT_DIR}/tools/kernel-choice-conf-gen.sh
38+
menuconfig-script/channel_choice:
39+
@${CURRENT_DIR}/tools/channel-choice-conf-gen.sh
3640

3741
build_option:
3842
@if [ ! -f .config ]; then make menuconfig ; fi

build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ check_bool() {
316316
}
317317

318318
_run_cleansh(){
319-
bash $([[ "${bash_debug}" = true ]] && echo -n "-x" ) "${tools_dir}/clean.sh" -o -w "$(realpath "${build_dir}")" "$([[ "${debug}" = true ]] && printf "%s" "-d")" "$([[ "${noconfirm}" = true ]] && printf "%s" "-n")" "$([[ "${nocolor}" = true ]] && printf "%s" "--nocolor")"
319+
bash "$([[ "${bash_debug}" = true ]] && echo -n "-x" || echo -n "+x")" "${tools_dir}/clean.sh" -o -w "$(realpath "${build_dir}")" "$([[ "${debug}" = true ]] && printf "%s" "-d")" "$([[ "${noconfirm}" = true ]] && printf "%s" "-n")" "$([[ "${nocolor}" = true ]] && printf "%s" "--nocolor")"
320320
}
321321

322322

@@ -1125,7 +1125,7 @@ while true; do
11251125
if [[ "${2}" = "reset" ]]; then
11261126
sfs_comp_opt=()
11271127
else
1128-
sfs_comp_opt=(${2})
1128+
IFS=" " read -r -a sfs_comp_opt <<< "${2}"
11291129
fi
11301130
shift 2
11311131
;;
@@ -1242,7 +1242,7 @@ while true; do
12421242
shift 2
12431243
;;
12441244
--tar-opts)
1245-
tar_comp_opt=(${2})
1245+
IFS=" " read -r -a tar_comp_opt <<< "${2}"
12461246
shift 2
12471247
;;
12481248
--)

docs/jp/BUILD.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@ sudo pacman -S --needed curl dosfstools git libburn libisofs lz4 lzo make pyalpm
4242
make menuconfig
4343
```
4444

45+
設定が完了したら以下のコマンドでビルドできます
46+
47+
```bash
48+
sudo make build
49+
```
50+
4551
### GUIを使用する
4652
GUIで設定を行ってビルドできます。GUIには`python-gobject`が必須です。
4753

menuconfig-script/rootconf

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,18 +113,26 @@ menu "Live環境の設定"
113113
config CUSTOM_PASSWD
114114
string "パスワード"
115115
endif
116-
choice
117-
prompt "チャンネル"
118-
default CHANNEL_XFCE
119-
help
120-
"使用するチャンネルを選択します。"
121-
config CHANNEL_XFCE
122-
bool "Xfce"
123-
config CHANNEL_PLASMA
124-
bool "Kde Plasma"
125-
config CHANNEL_LXDE
126-
bool "lxde"
127-
endchoice
116+
if X64_BUILD
117+
choice
118+
prompt "チャンネル"
119+
source channels_menuconfig-x86_64
120+
endchoice
121+
endif
122+
if I686_BUILD
123+
choice
124+
prompt "チャンネル"
125+
source channels_menuconfig-i686
126+
endchoice
127+
endif
128128
config IMAGE_OWNER
129129
string "イメージファイルの所有者名"
130130
endmenu
131+
menu "その他ビルド設定"
132+
config USE_CUSTOM_WORK
133+
bool "カスタムワークディレクトリを使用する"
134+
if USE_CUSTOM_WORK
135+
config CUSTOM_WORKDIR
136+
string "ワークディレクトリ"
137+
endif
138+
endmenu

mkinitcpio/mkinitcpio-archiso-plymouth.conf

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,136 @@
88
# /etc/mkinitcpio-archiso.conf
99
#
1010

11+
# MODULES
12+
# The following modules are loaded before any boot hooks are
13+
# run. Advanced users may wish to specify all system modules
14+
# in this array. For instance:
15+
# MODULES=(piix ide_disk reiserfs)
16+
MODULES=()
17+
18+
# BINARIES
19+
# This setting includes any additional binaries a given user may
20+
# wish into the CPIO image. This is run last, so it may be used to
21+
# override the actual binaries included by a given hook
22+
# BINARIES are dependency parsed, so you may safely ignore libraries
23+
BINARIES=()
24+
25+
# FILES
26+
# This setting is similar to BINARIES above, however, files are added
27+
# as-is and are not parsed in any way. This is useful for config files.
28+
FILES=()
29+
30+
# HOOKS
31+
# This is the most important setting in this file. The HOOKS control the
32+
# modules and scripts added to the image, and what happens at boot time.
33+
# Order is important, and it is recommended that you do not change the
34+
# order in which HOOKS are added. Run 'mkinitcpio -H <hook name>' for
35+
# help on a given hook.
36+
# 'base' is _required_ unless you know precisely what you are doing.
37+
# 'udev' is _required_ in order to automatically load modules
38+
# 'filesystems' is _required_ unless you specify your fs modules in MODULES
39+
# Examples:
40+
## This setup specifies all modules in the MODULES setting above.
41+
## No raid, lvm2, or encrypted root is needed.
42+
# HOOKS=(base)
43+
#
44+
## This setup will autodetect all modules for your system and should
45+
## work as a sane default
46+
# HOOKS=(base udev autodetect block filesystems)
47+
#
48+
## This setup will generate a 'full' image which supports most systems.
49+
## No autodetection is done.
50+
# HOOKS=(base udev block filesystems)
51+
#
52+
## This setup assembles a pata mdadm array with an encrypted root FS.
53+
## Note: See 'mkinitcpio -H mdadm' for more information on raid devices.
54+
# HOOKS=(base udev block mdadm encrypt filesystems)
55+
#
56+
## This setup loads an lvm2 volume group on a usb device.
57+
# HOOKS=(base udev block lvm2 filesystems)
58+
#
59+
## NOTE: If you have /usr on a separate partition, you MUST include the
60+
# usr, fsck and shutdown hooks.
61+
HOOKS=(base udev autodetect modconf block filesystems keyboard fsck)
62+
63+
# COMPRESSION
64+
# Use this to compress the initramfs image. By default, zstd compression
65+
# is used. Use 'cat' to create an uncompressed image.
66+
#COMPRESSION="zstd"
67+
#COMPRESSION="gzip"
68+
#COMPRESSION="bzip2"
69+
#COMPRESSION="lzma"
70+
#COMPRESSION="xz"
71+
#COMPRESSION="lzop"
72+
#COMPRESSION="lz4"
73+
74+
# COMPRESSION_OPTIONS
75+
# Additional options for the compressor
76+
#COMPRESSION_OPTIONS=()
77+
78+
# MODULES
79+
# The following modules are loaded before any boot hooks are
80+
# run. Advanced users may wish to specify all system modules
81+
# in this array. For instance:
82+
# MODULES=(piix ide_disk reiserfs)
83+
MODULES=()
84+
85+
# BINARIES
86+
# This setting includes any additional binaries a given user may
87+
# wish into the CPIO image. This is run last, so it may be used to
88+
# override the actual binaries included by a given hook
89+
# BINARIES are dependency parsed, so you may safely ignore libraries
90+
BINARIES=()
91+
92+
# FILES
93+
# This setting is similar to BINARIES above, however, files are added
94+
# as-is and are not parsed in any way. This is useful for config files.
95+
FILES=()
96+
97+
# HOOKS
98+
# This is the most important setting in this file. The HOOKS control the
99+
# modules and scripts added to the image, and what happens at boot time.
100+
# Order is important, and it is recommended that you do not change the
101+
# order in which HOOKS are added. Run 'mkinitcpio -H <hook name>' for
102+
# help on a given hook.
103+
# 'base' is _required_ unless you know precisely what you are doing.
104+
# 'udev' is _required_ in order to automatically load modules
105+
# 'filesystems' is _required_ unless you specify your fs modules in MODULES
106+
# Examples:
107+
## This setup specifies all modules in the MODULES setting above.
108+
## No raid, lvm2, or encrypted root is needed.
109+
# HOOKS=(base)
110+
#
111+
## This setup will autodetect all modules for your system and should
112+
## work as a sane default
113+
# HOOKS=(base udev autodetect block filesystems)
114+
#
115+
## This setup will generate a 'full' image which supports most systems.
116+
## No autodetection is done.
117+
# HOOKS=(base udev block filesystems)
118+
#
119+
## This setup assembles a pata mdadm array with an encrypted root FS.
120+
## Note: See 'mkinitcpio -H mdadm' for more information on raid devices.
121+
# HOOKS=(base udev block mdadm encrypt filesystems)
122+
#
123+
## This setup loads an lvm2 volume group on a usb device.
124+
# HOOKS=(base udev block lvm2 filesystems)
125+
#
126+
## NOTE: If you have /usr on a separate partition, you MUST include the
127+
# usr, fsck and shutdown hooks.
11128
HOOKS=(base udev plymouth memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard)
129+
130+
# COMPRESSION
131+
# Use this to compress the initramfs image. By default, zstd compression
132+
# is used. Use 'cat' to create an uncompressed image.
133+
#COMPRESSION="zstd"
134+
#COMPRESSION="gzip"
135+
#COMPRESSION="bzip2"
136+
#COMPRESSION="lzma"
12137
COMPRESSION="xz"
138+
#COMPRESSION="lzop"
139+
#COMPRESSION="lz4"
140+
141+
# COMPRESSION_OPTIONS
142+
# Additional options for the compressor
13143
COMPRESSION_OPTIONS=(--check=crc32 --threads=8)

mkinitcpio/mkinitcpio-archiso.conf

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,69 @@
88
# /etc/mkinitcpio-archiso.conf
99
#
1010

11+
# MODULES
12+
# The following modules are loaded before any boot hooks are
13+
# run. Advanced users may wish to specify all system modules
14+
# in this array. For instance:
15+
# MODULES=(piix ide_disk reiserfs)
16+
MODULES=()
17+
18+
# BINARIES
19+
# This setting includes any additional binaries a given user may
20+
# wish into the CPIO image. This is run last, so it may be used to
21+
# override the actual binaries included by a given hook
22+
# BINARIES are dependency parsed, so you may safely ignore libraries
23+
BINARIES=()
24+
25+
# FILES
26+
# This setting is similar to BINARIES above, however, files are added
27+
# as-is and are not parsed in any way. This is useful for config files.
28+
FILES=()
29+
30+
# HOOKS
31+
# This is the most important setting in this file. The HOOKS control the
32+
# modules and scripts added to the image, and what happens at boot time.
33+
# Order is important, and it is recommended that you do not change the
34+
# order in which HOOKS are added. Run 'mkinitcpio -H <hook name>' for
35+
# help on a given hook.
36+
# 'base' is _required_ unless you know precisely what you are doing.
37+
# 'udev' is _required_ in order to automatically load modules
38+
# 'filesystems' is _required_ unless you specify your fs modules in MODULES
39+
# Examples:
40+
## This setup specifies all modules in the MODULES setting above.
41+
## No raid, lvm2, or encrypted root is needed.
42+
# HOOKS=(base)
43+
#
44+
## This setup will autodetect all modules for your system and should
45+
## work as a sane default
46+
# HOOKS=(base udev autodetect block filesystems)
47+
#
48+
## This setup will generate a 'full' image which supports most systems.
49+
## No autodetection is done.
50+
# HOOKS=(base udev block filesystems)
51+
#
52+
## This setup assembles a pata mdadm array with an encrypted root FS.
53+
## Note: See 'mkinitcpio -H mdadm' for more information on raid devices.
54+
# HOOKS=(base udev block mdadm encrypt filesystems)
55+
#
56+
## This setup loads an lvm2 volume group on a usb device.
57+
# HOOKS=(base udev block lvm2 filesystems)
58+
#
59+
## NOTE: If you have /usr on a separate partition, you MUST include the
60+
# usr, fsck and shutdown hooks.
1161
HOOKS=(base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard)
62+
63+
# COMPRESSION
64+
# Use this to compress the initramfs image. By default, zstd compression
65+
# is used. Use 'cat' to create an uncompressed image.
66+
#COMPRESSION="zstd"
67+
#COMPRESSION="gzip"
68+
#COMPRESSION="bzip2"
69+
#COMPRESSION="lzma"
1270
COMPRESSION="xz"
71+
#COMPRESSION="lzop"
72+
#COMPRESSION="lz4"
73+
74+
# COMPRESSION_OPTIONS
75+
# Additional options for the compressor
1376
COMPRESSION_OPTIONS=(--check=crc32 --threads=8)

mkinitcpio/mkinitcpio-plymouth.conf

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
# /etc/mkinitcpio.conf
99
#
1010

11-
# vim:set ft=sh
1211
# MODULES
1312
# The following modules are loaded before any boot hooks are
1413
# run. Advanced users may wish to specify all system modules
@@ -62,15 +61,15 @@ FILES=()
6261
HOOKS=(base udev plymouth autodetect modconf block filesystems keyboard fsck)
6362

6463
# COMPRESSION
65-
# Use this to compress the initramfs image. By default, gzip compression
64+
# Use this to compress the initramfs image. By default, zstd compression
6665
# is used. Use 'cat' to create an uncompressed image.
66+
#COMPRESSION="zstd"
6767
#COMPRESSION="gzip"
6868
#COMPRESSION="bzip2"
6969
#COMPRESSION="lzma"
7070
#COMPRESSION="xz"
7171
#COMPRESSION="lzop"
7272
#COMPRESSION="lz4"
73-
#COMPRESSION="zstd"
7473

7574
# COMPRESSION_OPTIONS
7675
# Additional options for the compressor

mkinitcpio/mkinitcpio.conf

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
# /etc/mkinitcpio.conf
99
#
1010

11-
# vim:set ft=sh
1211
# MODULES
1312
# The following modules are loaded before any boot hooks are
1413
# run. Advanced users may wish to specify all system modules
@@ -62,15 +61,15 @@ FILES=()
6261
HOOKS=(base udev autodetect modconf block filesystems keyboard fsck)
6362

6463
# COMPRESSION
65-
# Use this to compress the initramfs image. By default, gzip compression
64+
# Use this to compress the initramfs image. By default, zstd compression
6665
# is used. Use 'cat' to create an uncompressed image.
66+
#COMPRESSION="zstd"
6767
#COMPRESSION="gzip"
6868
#COMPRESSION="bzip2"
6969
#COMPRESSION="lzma"
7070
#COMPRESSION="xz"
7171
#COMPRESSION="lzop"
7272
#COMPRESSION="lz4"
73-
#COMPRESSION="zstd"
7473

7574
# COMPRESSION_OPTIONS
7675
# Additional options for the compressor

0 commit comments

Comments
 (0)