Merge branch 'dev' into dev-stable

Author: Hayao0819

.gitignore

@@ -20,4 +20,7 @@ work/
 *.ig*
 *.add*
 temp/
-/custom.conf
+.config.old
+system/cpp-src/mkalteriso/CMakeLists.txt.user
+menuconfig-script/kernel_choice_*
+/custom.conf

Dockerfile

@@ -1,11 +1,12 @@
 FROM archlinux:latest
 RUN echo 'Server = http://mirrors.cat.net/archlinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist \
 && echo 'nameserver 1.1.1.1' > /etc/resolv.conf
+RUN echo
 RUN pacman -Syyu --noconfirm
 RUN pacman -S archiso git arch-install-scripts sudo qt5-base cmake ninja base-devel --noconfirm
 RUN pacman-key --init
 COPY . /alterlinux
 WORKDIR /alterlinux
-RUN git checkout dev
-RUN ./keyring.sh -a
-CMD ["./build.sh", "-b"]
+RUN ./tools/keyring.sh -a
+ENTRYPOINT ["./build.sh"]
+CMD []

Makefile

@@ -7,8 +7,9 @@ ARCH_x86_64  = -a x86_64
 ARCH_i686    = -a i686
 
 
+
 full:mkalteriso
-	@sudo ./fullbuild.sh
+	@sudo ./tools/fullbuild.sh
 	@make clean
 
 xfce-64:mkalteriso
@@ -62,7 +63,7 @@ mkalteriso:
 
 menuconfig:menuconfig/build/mconf menuconfig-script/kernel_choice
 	menuconfig/build/mconf menuconfig-script/rootconf
-menuconfig-script/kernel_choice:system/kernel_list-x86_64 system/kernel_list-i686
+menuconfig-script/kernel_choice:system/kernel-x86_64 system/kernel-i686
 	./kernel-choice-conf-gen.sh
 build_option:
 	if [ -f .config ];\
@@ -78,4 +79,4 @@ build:build_option mkalteriso
 	$(eval BUILD_OPTION := $(shell cat ./.build_option))
 	sudo ./${BUILD_SCRIPT} ${BUILD_OPTION}
 keyring::
-	sudo ./keyring.sh --alter-add --arch-add
+	sudo ./tools/keyring.sh --alter-add --arch-add