Merge branch 'dev' into pacman-debug

Author: Hayao0819

.gitignore

@@ -23,3 +23,6 @@ temp/
 system/cpp-src/mkalteriso/CMakeLists.txt.user
 menuconfig-script/kernel_choice_*
 /custom.conf
+/out/
+out
+/pacman-*.conf

.travis.yml

@@ -10,12 +10,6 @@ addons:
 script:
   - bash -c 'shopt -s globstar nullglob; shellcheck -s bash --exclude=SC2068 -S error **/*.{sh,ksh,bash}'
   - bash -c 'shopt -s globstar nullglob; shellcheck -s bash --exclude=SC2068 -S error tools/*.{sh,ksh,bash}'
-  - cd system/cpp-src/mkalteriso
-  - mkdir -p build
-  - cd build
-  - cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ ..
-  - make
-  
 git:
   submodules: false
   language: bash

Dockerfile

@@ -1,12 +1,14 @@
 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
+RUN echo 'Server = https://mirrors.kernel.org/archlinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist
+RUN pacman -Sy --noconfirm reflector
+RUN reflector --protocol https -c Japan --sort rate --save /etc/pacman.d/mirrorlist
+RUN pacman -Syyu --noconfirm \
+        git sudo python3 \
+        base-devel cmake ninja qt5-base \
+        archiso arch-install-scripts pyalpm
 COPY . /alterlinux
 WORKDIR /alterlinux
+RUN pacman-key --init
 RUN ./tools/keyring.sh -a
 ENTRYPOINT ["./build.sh"]
 CMD []

Makefile

@@ -1,16 +1,16 @@
 
 BUILD_SCRIPT := build.sh
 KERNEL       := zen
-SHARE_OPTION := --boot-splash --comp-type "xz" --user "alter" --password "alter" --kernel "${KERNEL}" --debug
+SHARE_OPTION := --boot-splash --comp-type "xz" --user "alter" --password "alter" --kernel "${KERNEL}" --debug --noconfirm
 ARCH_x86_64  := --arch x86_64
 ARCH_i686    := --arch i686
 CURRENT_DIR  := ${shell dirname $(dir $(abspath $(lastword $(MAKEFILE_LIST))))}/${shell basename $(dir $(abspath $(lastword $(MAKEFILE_LIST))))}
 
-full:mkalteriso
-	@sudo ${CURRENT_DIR}/tools/fullbuild.sh
+full:
+	@sudo ${CURRENT_DIR}/tools/fullbuild.sh -d
 	@make clean
 
-xfce-64 xfce-32 lxde-64 lxde-32 plasma-64 releng-32 releng-64 cinnamon-64 cinnamon-32 deepin-64 gnome-64 gnomemac-64 i3-64 i3-32:mkalteriso
+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:
 	$(eval CHANNEL=${shell echo ${@} | cut -d '-' -f 1})
 	$(eval ARCHITECTURE=${shell echo ${@} | cut -d '-' -f 2})
 	@case ${ARCHITECTURE} in\
@@ -20,49 +20,28 @@ xfce-64 xfce-32 lxde-64 lxde-32 plasma-64 releng-32 releng-64 cinnamon-64 cinnam
 	@make clean
 
 menuconfig/build/mconf::
-	@if [ -d menuconfig/build ];\
-	then \
-		:;\
-	else \
-		mkdir menuconfig/build ;\
-	fi
+	@mkdir -p menuconfig/build
 	(cd menuconfig/build ; cmake -GNinja .. ; ninja -j4 )
 
-mkalteriso:
-	@if [ -d system/cpp-src/mkalteriso/build ];\
-	then \
-		:;\
-	else \
-		mkdir system/cpp-src/mkalteriso/build ;\
-	fi
-	(cd system/cpp-src/mkalteriso/build ; cmake -GNinja .. ; ninja -j4 ; cp -f mkalteriso ../../../)
-
 menuconfig:menuconfig/build/mconf menuconfig-script/kernel_choice
-	menuconfig/build/mconf menuconfig-script/rootconf
+	@menuconfig/build/mconf menuconfig-script/rootconf
 
 menuconfig-script/kernel_choice:system/kernel-x86_64 system/kernel-i686
-	${CURRENT_DIR}/tools/kernel-choice-conf-gen.sh
+	@${CURRENT_DIR}/tools/kernel-choice-conf-gen.sh
 
 build_option:
-	if [ -f .config ];\
-	then \
-		:;\
-	else \
-		make menuconfig ;\
-	fi
+	@if [ ! -f .config ]; then make menuconfig ; fi
 	${CURRENT_DIR}/tools/menuconf-to-alterconf.sh ${CURRENT_DIR}/.build_option
 
 clean:
 	@sudo ${CURRENT_DIR}/${BUILD_SCRIPT} clean
 
-build:build_option mkalteriso
+build:build_option
 	$(eval BUILD_OPTION := $(shell cat ${CURRENT_DIR}/.build_option))
-	sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${BUILD_OPTION}
+	@sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${BUILD_OPTION}
 
 keyring::
-	sudo ${CURRENT_DIR}/tools/keyring.sh --alter-add --arch-add
+	@sudo ${CURRENT_DIR}/tools/keyring.sh --alter-add --arch-add
 
 wizard:
-	sudo ${CURRENT_DIR}/tools/wizard.sh
-
-
+	@sudo ${CURRENT_DIR}/tools/wizard.sh