Skip to content

Commit b7f23c7

Browse files
Hayao0819Hayao0819
authored
Merge branch 'dev' into dev-stable
2 parents 51270b1 + 9a9dc48 commit b7f23c7

File tree

1,169 files changed

+20415
-24640
lines changed

Some content is hidden

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

1,169 files changed

+20415
-24640
lines changed

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
name: "CodeQL"
7+
8+
on:
9+
push:
10+
branches: [dev, dev-stable, master]
11+
pull_request:
12+
# The branches below must be a subset of the branches above
13+
branches: [dev]
14+
schedule:
15+
- cron: '0 17 * * 2'
16+
17+
jobs:
18+
analyze:
19+
name: Analyze
20+
runs-on: ubuntu-latest
21+
22+
strategy:
23+
fail-fast: false
24+
matrix:
25+
# Override automatic language detection by changing the below list
26+
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
27+
language: ['cpp', 'python']
28+
# Learn more...
29+
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
30+
31+
steps:
32+
- name: Checkout repository
33+
uses: actions/checkout@v2
34+
with:
35+
# We must fetch at least the immediate parents so that if this is
36+
# a pull request then we can checkout the head.
37+
fetch-depth: 2
38+
39+
# If this run was triggered by a pull request event, then checkout
40+
# the head of the pull request instead of the merge commit.
41+
- run: git checkout HEAD^2
42+
if: ${{ github.event_name == 'pull_request' }}
43+
44+
# Initializes the CodeQL tools for scanning.
45+
- name: Initialize CodeQL
46+
uses: github/codeql-action/init@v1
47+
with:
48+
languages: ${{ matrix.language }}
49+
# If you wish to specify custom queries, you can do so here or in a config file.
50+
# By default, queries listed here will override any specified in a config file.
51+
# Prefix the list here with "+" to use these queries and those in the config file.
52+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
53+
54+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
55+
# If this step fails, then you should remove it and run the build manually (see below)
56+
- name: Autobuild
57+
uses: github/codeql-action/autobuild@v1
58+
59+
# ℹ️ Command-line programs to run using the OS shell.
60+
# 📚 https://git.io/JvXDl
61+
62+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
63+
# and modify them (or add more) to build your code if your project
64+
# uses a compiled language
65+
66+
#- run: |
67+
# make bootstrap
68+
# make release
69+
70+
- name: Perform CodeQL Analysis
71+
uses: github/codeql-action/analyze@v1

‎.github/workflows/codescan-analysis.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# This workflow requires that you have an existing account with codescan.io
2+
# For more information about configuring your workflow,
3+
# read our documentation at https://github.com/codescan-io/codescan-scanner-action
4+
name: CodeScan
5+
6+
on:
7+
push:
8+
branches: [master, main]
9+
pull_request:
10+
# The branches below must be a subset of the branches above
11+
branches: [master, main]
12+
13+
jobs:
14+
CodeScan:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Checkout repository
18+
uses: actions/checkout@v2
19+
- name: Cache files
20+
uses: actions/cache@v2
21+
with:
22+
path: |
23+
~/.sonar
24+
key: ${{ runner.os }}-sonar
25+
restore-keys: ${{ runner.os }}-sonar
26+
- name: Run Analysis
27+
uses: codescan-io/codescan-scanner-action@master
28+
with:
29+
login: ${{ secrets.CODESCAN_AUTH_TOKEN }}
30+
organization: ${{ secrets.CODESCAN_ORGANIZATION_KEY }}
31+
projectKey: ${{ secrets.CODESCAN_PROJECT_KEY }}
32+
- name: Upload SARIF file
33+
uses: github/codeql-action/upload-sarif@v1
34+
with:
35+
sarif_file: codescan.sarif

‎.gitignore‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
*.sig
1111
.build_option
1212
system/mkalteriso
13-
system/cpp-src/mkalteriso
1413
system/cpp-src/mkalteriso/build/
1514
pkg/
1615
src/
@@ -19,4 +18,8 @@ work/
1918
*.ignore*
2019
*.ig*
2120
*.add*
22-
temp/
21+
temp/
22+
.config.old
23+
system/cpp-src/mkalteriso/CMakeLists.txt.user
24+
menuconfig-script/kernel_choice_*
25+
/custom.conf

‎.travis.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
language: shell
2+
sudo: required
3+
addons:
4+
apt:
5+
packages:
6+
- ninja
7+
- cmake
8+
- clang
9+
- qtbase5-dev
210
script:
311
- bash -c 'shopt -s globstar nullglob; shellcheck -s bash --exclude=SC2068 -S error **/*.{sh,ksh,bash}'
12+
- bash -c 'shopt -s globstar nullglob; shellcheck -s bash --exclude=SC2068 -S error tools/*.{sh,ksh,bash}'
13+
- cd system/cpp-src/mkalteriso
14+
- mkdir -p build
15+
- cd build
16+
- cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ ..
17+
- make
18+
419
git:
520
submodules: false
21+
language: bash

‎.vscode/launch.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
"args": []
1313
}
1414
]
15-
}
15+
}

‎Dockerfile‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
FROM archlinux:latest
2-
RUN echo 'Server = http://mirrors.cat.net/archlinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist \
3-
&& echo 'nameserver 1.1.1.1' > /etc/resolv.conf
4-
RUN pacman -Syyu --noconfirm
5-
RUN pacman -S archiso git arch-install-scripts sudo qt5-base cmake ninja base-devel --noconfirm
6-
RUN pacman-key --init
2+
RUN echo 'Server = https://mirrors.kernel.org/archlinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist
3+
RUN pacman -Sy --noconfirm reflector
4+
RUN reflector --protocol https -c Japan --sort rate --save /etc/pacman.d/mirrorlist
5+
RUN pacman -Syyu --noconfirm \
6+
git sudo python3 \
7+
base-devel cmake ninja qt5-base \
8+
archiso arch-install-scripts pyalpm
79
COPY . /alterlinux
810
WORKDIR /alterlinux
9-
RUN git checkout dev
10-
RUN ./keyring.sh -a
11-
CMD ["./build.sh", "-b"]
11+
RUN pacman-key --init
12+
RUN ./tools/keyring.sh -a
13+
ENTRYPOINT ["./build.sh"]
14+
CMD []

‎Makefile‎

Lines changed: 36 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,51 @@
11

2-
BUILD_SCRIPT = build.sh
3-
KERNEL = zen
4-
SHARE_OPTION = -b -c "zstd" -u "alter" -p "alter" -k "${KERNEL}"
5-
DEBUG_OPTION = -t '-Xcompression-level 1' -x -d
6-
ARCH_x86_64 = -a x86_64
7-
ARCH_i686 = -a i686
8-
2+
BUILD_SCRIPT := build.sh
3+
KERNEL := zen
4+
SHARE_OPTION := --boot-splash --comp-type "xz" --user "alter" --password "alter" --kernel "${KERNEL}" --debug --noconfirm
5+
ARCH_x86_64 := --arch x86_64
6+
ARCH_i686 := --arch i686
7+
CURRENT_DIR := ${shell dirname $(dir $(abspath $(lastword $(MAKEFILE_LIST))))}/${shell basename $(dir $(abspath $(lastword $(MAKEFILE_LIST))))}
98

109
full:mkalteriso
11-
@sudo ./fullbuild.sh
12-
@make clean
13-
14-
xfce-64:mkalteriso
15-
@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} xfce
16-
@make clean
17-
18-
plasma-64:mkalteriso
19-
@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} plasma
20-
@make clean
21-
22-
releng-64:mkalteriso
23-
@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} releng
24-
@make clean
25-
26-
lxde-64:mkalteriso
27-
@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} lxde
10+
@sudo ${CURRENT_DIR}/tools/fullbuild.sh -d
2811
@make clean
2912

30-
xfce-32:mkalteriso
31-
@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} xfce
32-
@make clean
33-
34-
plasma-32::mkalteriso
35-
@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} plasma
36-
@make clean
37-
38-
releng-32:mkalteriso
39-
@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} releng
40-
@make clean
41-
42-
lxde-32:mkalteriso
43-
@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} lxde
13+
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:mkalteriso
14+
$(eval CHANNEL=${shell echo ${@} | cut -d '-' -f 1})
15+
$(eval ARCHITECTURE=${shell echo ${@} | cut -d '-' -f 2})
16+
@case ${ARCHITECTURE} in\
17+
"32") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} ${CHANNEL} ;;\
18+
"64") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} ${CHANNEL};;\
19+
esac
4420
@make clean
4521

4622
menuconfig/build/mconf::
47-
@if [ -d menuconfig/build ];\
48-
then \
49-
:;\
50-
else \
51-
mkdir menuconfig/build ;\
52-
fi
23+
@mkdir -p menuconfig/build
5324
(cd menuconfig/build ; cmake -GNinja .. ; ninja -j4 )
25+
5426
mkalteriso:
55-
@if [ -d system/cpp-src/mkalteriso/build ];\
56-
then \
57-
:;\
58-
else \
59-
mkdir system/cpp-src/mkalteriso/build ;\
60-
fi
61-
(cd system/cpp-src/mkalteriso/build ; cmake -GNinja .. ; ninja -j4 ; cp -f mkalteriso ../../../)
62-
27+
@mkdir -p system/cpp-src/mkalteriso/build
28+
@(cd system/cpp-src/mkalteriso/build ; cmake -GNinja .. ; ninja -j4 ; cp -f mkalteriso ../../../)
29+
6330
menuconfig:menuconfig/build/mconf menuconfig-script/kernel_choice
64-
menuconfig/build/mconf menuconfig-script/rootconf
65-
menuconfig-script/kernel_choice:system/kernel_list-x86_64 system/kernel_list-i686
66-
./kernel-choice-conf-gen.sh
31+
@menuconfig/build/mconf menuconfig-script/rootconf
32+
33+
menuconfig-script/kernel_choice:system/kernel-x86_64 system/kernel-i686
34+
@${CURRENT_DIR}/tools/kernel-choice-conf-gen.sh
35+
6736
build_option:
68-
if [ -f .config ];\
69-
then \
70-
:;\
71-
else \
72-
make menuconfig ;\
73-
fi
74-
./menuconf-to-alterconf.sh ./.build_option
37+
@if [ ! -f .config ]; then make menuconfig ; fi
38+
${CURRENT_DIR}/tools/menuconf-to-alterconf.sh ${CURRENT_DIR}/.build_option
39+
7540
clean:
76-
@sudo ./${BUILD_SCRIPT} clean
41+
@sudo ${CURRENT_DIR}/${BUILD_SCRIPT} clean
42+
7743
build:build_option mkalteriso
78-
$(eval BUILD_OPTION := $(shell cat ./.build_option))
79-
sudo ./${BUILD_SCRIPT} ${BUILD_OPTION}
44+
$(eval BUILD_OPTION := $(shell cat ${CURRENT_DIR}/.build_option))
45+
@sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${BUILD_OPTION}
46+
8047
keyring::
81-
sudo ./keyring.sh --alter-add --arch-add
48+
@sudo ${CURRENT_DIR}/tools/keyring.sh --alter-add --arch-add
49+
50+
wizard:
51+
@sudo ${CURRENT_DIR}/tools/wizard.sh

0 commit comments

Comments
 (0)