Skip to content

Commit 8d8aee3

Browse files
zijiren233zijiren233
committed
chore: bump config
1 parent 4ec2fbf commit 8d8aee3

File tree

2 files changed

+85
-74
lines changed

2 files changed

+85
-74
lines changed

‎build.sh‎

Lines changed: 54 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,50 @@
22
set -e
33

44
for i in "$@"; do
5-
case ${i,,} in
6-
--version=*)
7-
XANMODVER="${i#*=}"
8-
shift
9-
;;
10-
--version)
11-
echo "Please use '--${i#--}=' to assign value to option"
12-
exit 1
13-
;;
14-
--ccache)
15-
USE_CCACHE=true
16-
export KBUILD_BUILD_TIMESTAMP=''
17-
shift
18-
;;
19-
-*)
20-
echo "Unknown option $i"
21-
exit 1
22-
;;
23-
*) ;;
24-
esac
5+
case ${i,,} in
6+
--version=*)
7+
XANMODVER="${i#*=}"
8+
shift
9+
;;
10+
--version)
11+
echo "Please use '--${i#--}=' to assign value to option"
12+
exit 1
13+
;;
14+
--ccache)
15+
USE_CCACHE=true
16+
export KBUILD_BUILD_TIMESTAMP=''
17+
shift
18+
;;
19+
-*)
20+
echo "Unknown option $i"
21+
exit 1
22+
;;
23+
*) ;;
24+
esac
2525
done
2626

2727
if [[ ! ${XANMODVER} =~ ^[0-9]+\.[0-9]+\.[0-9]+(-[a-z0-9]+)*-xanmod[0-9]+$ ]]; then
28-
echo "XANMODVER is not in format 'x.y.z(-something)-xanmodN'"
29-
exit 1
28+
echo "XANMODVER is not in format 'x.y.z(-something)-xanmodN'"
29+
exit 1
3030
fi
3131

3232
echo "xanmod version: ${XANMODVER}"
3333

3434
dpkg --add-architecture arm64
3535

36-
apt update &&
37-
apt install -y wget make \
38-
flex bison libncurses-dev perl libssl-dev:arm64 \
39-
libelf-dev:arm64 libelf-dev:native libssl-dev:native build-essential lsb-release \
40-
bc debhelper rsync kmod cpio debhelper-compat gcc-aarch64-linux-gnu libdw-dev:native
36+
apt update
37+
38+
apt install -y wget make \
39+
flex bison libncurses-dev perl libssl-dev:arm64 \
40+
libelf-dev:arm64 libelf-dev:native libssl-dev:native build-essential lsb-release \
41+
bc debhelper rsync kmod cpio debhelper-compat gcc-aarch64-linux-gnu libdw-dev:native
42+
4143
. "$HOME/.cargo/env" || true
4244
if ! command -v rustup >/dev/null 2>&1; then
43-
# export RUSTUP_DIST_SERVER=https://mirrors.ustc.edu.cn/rust-static
44-
# export RUSTUP_UPDATE_ROOT=https://mirrors.ustc.edu.cn/rust-static/rustup
45-
curl https://sh.rustup.rs -sSf | bash -s -- -y
46-
. "$HOME/.cargo/env"
45+
# export RUSTUP_DIST_SERVER=https://mirrors.ustc.edu.cn/rust-static
46+
# export RUSTUP_UPDATE_ROOT=https://mirrors.ustc.edu.cn/rust-static/rustup
47+
curl https://sh.rustup.rs -sSf | bash -s -- -y
48+
. "$HOME/.cargo/env"
4749
fi
4850
rustup default stable
4951

@@ -52,34 +54,34 @@ wget "https://gitlab.com/xanmod/linux/-/archive/${XANMODVER}/linux-${XANMODVER}.
5254
mkdir -p "linux-${XANMODVER}-kernel"
5355
rm -rf "linux-${XANMODVER}-kernel/*"
5456
tar -zxf "linux-${XANMODVER}.tar.gz" \
55-
-C "linux-${XANMODVER}-kernel" \
56-
--strip-components=1
57+
-C "linux-${XANMODVER}-kernel" \
58+
--strip-components=1
5759
cd "linux-${XANMODVER}-kernel"
5860

59-
cp ../configs/config-6.12.30+bpo-arm64 .config
61+
cp ../configs/config-6.12.43+deb12-arm64 .config
6062

6163
undefine() {
62-
for _config_name in "$@"; do
63-
scripts/config -k --undefine "${_config_name}"
64-
done
64+
for _config_name in "$@"; do
65+
scripts/config -k --undefine "${_config_name}"
66+
done
6567
}
6668

6769
enable() {
68-
for _config_name in "$@"; do
69-
scripts/config -k --enable "${_config_name}"
70-
done
70+
for _config_name in "$@"; do
71+
scripts/config -k --enable "${_config_name}"
72+
done
7173
}
7274

7375
disable() {
74-
for _config_name in "$@"; do
75-
scripts/config -k --disable "${_config_name}"
76-
done
76+
for _config_name in "$@"; do
77+
scripts/config -k --disable "${_config_name}"
78+
done
7779
}
7880

7981
module() {
80-
for _config_name in "$@"; do
81-
scripts/config -k --module "${_config_name}"
82-
done
82+
for _config_name in "$@"; do
83+
scripts/config -k --module "${_config_name}"
84+
done
8385
}
8486

8587
# debug
@@ -132,9 +134,9 @@ disable MODULE_SIG_SHA512
132134
enable "TCP_CONG_ADVANCED"
133135
_tcp_cong_alg_list=("yeah" "bbr" "cubic" "vegas" "westwood" "reno")
134136
for _alg in "${_tcp_cong_alg_list[@]}"; do
135-
_alg_upper=$(echo "$_alg" | tr '[a-z]' '[A-Z]')
136-
enable "TCP_CONG_${_alg_upper}"
137-
disable "DEFAULT_${_alg_upper}"
137+
_alg_upper=$(echo "$_alg" | tr '[a-z]' '[A-Z]')
138+
enable "TCP_CONG_${_alg_upper}"
139+
disable "DEFAULT_${_alg_upper}"
138140
done
139141
enable "DEFAULT_BBR"
140142
scripts/config --set-str "DEFAULT_TCP_CONG" "bbr"
@@ -155,12 +157,12 @@ rm -rf ${PKGS_DIR}/*
155157
export CROSS_COMPILE="aarch64-linux-gnu-"
156158
export CC="aarch64-linux-gnu-gcc"
157159
if [[ ${USE_CCACHE} == true ]]; then
158-
export CROSS_COMPILE="ccache aarch64-linux-gnu-"
159-
export CC="ccache aarch64-linux-gnu-gcc"
160+
export CROSS_COMPILE="ccache aarch64-linux-gnu-"
161+
export CC="ccache aarch64-linux-gnu-gcc"
160162
fi
161163

162164
MAKE="make \
163-
-j$((2 * $(nproc))) \
165+
-j$(nproc) \
164166
ARCH=arm64 \
165167
INSTALL_PATH=$INSTALL_DIR/boot \
166168
INSTALL_MOD_PATH=$INSTALL_DIR \

‎configs/config-6.12.30+bpo-arm64‎ renamed to ‎configs/config-6.12.43+deb12-arm64‎

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.12.30 Kernel Configuration
3+
# Linux/arm64 6.12.43 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc-12 (Debian 12.2.0-14+deb12u1) 12.2.0"
66
CONFIG_CC_IS_GCC=y
@@ -298,7 +298,7 @@ CONFIG_MMU=y
298298
CONFIG_ARM64_CONT_PTE_SHIFT=4
299299
CONFIG_ARM64_CONT_PMD_SHIFT=4
300300
CONFIG_ARCH_MMAP_RND_BITS_MIN=18
301-
CONFIG_ARCH_MMAP_RND_BITS_MAX=18
301+
CONFIG_ARCH_MMAP_RND_BITS_MAX=33
302302
CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
303303
CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
304304
CONFIG_STACKTRACE_SUPPORT=y
@@ -737,6 +737,7 @@ CONFIG_ACPI_WATCHDOG=y
737737
# CONFIG_ACPI_PFRUT is not set
738738
CONFIG_ACPI_IORT=y
739739
CONFIG_ACPI_GTDT=y
740+
# CONFIG_ACPI_AGDI is not set
740741
CONFIG_ACPI_APMT=y
741742
CONFIG_ACPI_PPTT=y
742743
CONFIG_ACPI_PCC=y
@@ -2478,7 +2479,7 @@ CONFIG_IMX_SCMI_MISC_EXT=y
24782479
# end of ARM System Control and Management Interface Protocol
24792480

24802481
CONFIG_ARM_SCPI_PROTOCOL=m
2481-
# CONFIG_ARM_SDE_INTERFACE is not set
2482+
CONFIG_ARM_SDE_INTERFACE=y
24822483
# CONFIG_FIRMWARE_MEMMAP is not set
24832484
CONFIG_DMIID=y
24842485
CONFIG_DMI_SYSFS=y
@@ -2552,7 +2553,6 @@ CONFIG_ARM_SMCCC_SOC_ID=y
25522553
#
25532554
# Tegra firmware driver
25542555
#
2555-
# CONFIG_TEGRA_IVC is not set
25562556
# end of Tegra firmware driver
25572557

25582558
#
@@ -2565,10 +2565,10 @@ CONFIG_ZYNQMP_FIRMWARE=y
25652565

25662566
CONFIG_GNSS=m
25672567
CONFIG_GNSS_SERIAL=m
2568-
# CONFIG_GNSS_MTK_SERIAL is not set
2568+
CONFIG_GNSS_MTK_SERIAL=m
25692569
CONFIG_GNSS_SIRF_SERIAL=m
25702570
CONFIG_GNSS_UBX_SERIAL=m
2571-
# CONFIG_GNSS_USB is not set
2571+
CONFIG_GNSS_USB=m
25722572
CONFIG_MTD=m
25732573
# CONFIG_MTD_TESTS is not set
25742574

@@ -3469,16 +3469,19 @@ CONFIG_SKGE=m
34693469
CONFIG_SKGE_GENESIS=y
34703470
CONFIG_SKY2=m
34713471
# CONFIG_SKY2_DEBUG is not set
3472-
# CONFIG_OCTEONTX2_AF is not set
3473-
# CONFIG_OCTEONTX2_PF is not set
3472+
CONFIG_OCTEONTX2_MBOX=m
3473+
CONFIG_OCTEONTX2_AF=m
3474+
# CONFIG_NDC_DIS_DYNAMIC_CACHING is not set
3475+
CONFIG_OCTEONTX2_PF=m
3476+
CONFIG_OCTEONTX2_VF=m
34743477
# CONFIG_OCTEON_EP is not set
34753478
# CONFIG_OCTEON_EP_VF is not set
34763479
# CONFIG_PRESTERA is not set
34773480
CONFIG_NET_VENDOR_MEDIATEK=y
34783481
# CONFIG_NET_AIROHA is not set
34793482
CONFIG_NET_MEDIATEK_SOC_WED=y
34803483
CONFIG_NET_MEDIATEK_SOC=m
3481-
# CONFIG_NET_MEDIATEK_STAR_EMAC is not set
3484+
CONFIG_NET_MEDIATEK_STAR_EMAC=m
34823485
CONFIG_NET_VENDOR_MELLANOX=y
34833486
CONFIG_MLX4_EN=m
34843487
CONFIG_MLX4_EN_DCB=y
@@ -3757,7 +3760,7 @@ CONFIG_CAN_VXCAN=m
37573760
CONFIG_CAN_NETLINK=y
37583761
CONFIG_CAN_CALC_BITTIMING=y
37593762
CONFIG_CAN_RX_OFFLOAD=y
3760-
# CONFIG_CAN_CAN327 is not set
3763+
CONFIG_CAN_CAN327=m
37613764
CONFIG_CAN_FLEXCAN=m
37623765
# CONFIG_CAN_GRCAN is not set
37633766
# CONFIG_CAN_KVASER_PCIEFD is not set
@@ -4205,15 +4208,17 @@ CONFIG_RTW88_8821CU=m
42054208
CONFIG_RTW89=m
42064209
CONFIG_RTW89_CORE=m
42074210
CONFIG_RTW89_PCI=m
4211+
CONFIG_RTW89_8851B=m
42084212
CONFIG_RTW89_8852A=m
42094213
CONFIG_RTW89_8852B_COMMON=m
42104214
CONFIG_RTW89_8852B=m
4215+
CONFIG_RTW89_8852BT=m
42114216
CONFIG_RTW89_8852C=m
42124217
CONFIG_RTW89_8922A=m
4213-
# CONFIG_RTW89_8851BE is not set
4218+
CONFIG_RTW89_8851BE=m
42144219
CONFIG_RTW89_8852AE=m
42154220
CONFIG_RTW89_8852BE=m
4216-
# CONFIG_RTW89_8852BTE is not set
4221+
CONFIG_RTW89_8852BTE=m
42174222
CONFIG_RTW89_8852CE=m
42184223
CONFIG_RTW89_8922AE=m
42194224
# CONFIG_RTW89_DEBUGMSG is not set
@@ -7246,7 +7251,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
72467251
# CONFIG_NOUVEAU_DEBUG_MMU is not set
72477252
# CONFIG_NOUVEAU_DEBUG_PUSH is not set
72487253
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
7249-
# CONFIG_DRM_NOUVEAU_GSP_DEFAULT is not set
7254+
CONFIG_DRM_NOUVEAU_GSP_DEFAULT=y
72507255
CONFIG_DRM_XE=m
72517256
CONFIG_DRM_XE_DISPLAY=y
72527257
CONFIG_DRM_XE_FORCE_PROBE=""
@@ -7934,7 +7939,8 @@ CONFIG_SND_SOC_MT8192=m
79347939
CONFIG_SND_SOC_MT8192_MT6359_RT1015_RT5682=m
79357940
CONFIG_SND_SOC_MT8195=m
79367941
CONFIG_SND_SOC_MT8195_MT6359=m
7937-
# CONFIG_SND_SOC_MT8365 is not set
7942+
CONFIG_SND_SOC_MT8365=m
7943+
CONFIG_SND_SOC_MT8365_MT6357=m
79387944

79397945
#
79407946
# ASoC support for Amlogic platforms
@@ -8346,7 +8352,7 @@ CONFIG_SND_SOC_WSA883X=m
83468352
# CONFIG_SND_SOC_ZL38060 is not set
83478353
# CONFIG_SND_SOC_MAX9759 is not set
83488354
# CONFIG_SND_SOC_MT6351 is not set
8349-
# CONFIG_SND_SOC_MT6357 is not set
8355+
CONFIG_SND_SOC_MT6357=m
83508356
CONFIG_SND_SOC_MT6358=m
83518357
CONFIG_SND_SOC_MT6359=m
83528358
# CONFIG_SND_SOC_MT6359_ACCDET is not set
@@ -8956,7 +8962,7 @@ CONFIG_USB_G_SERIAL=m
89568962
CONFIG_TYPEC=m
89578963
CONFIG_TYPEC_TCPM=m
89588964
CONFIG_TYPEC_TCPCI=m
8959-
# CONFIG_TYPEC_RT1711H is not set
8965+
CONFIG_TYPEC_RT1711H=m
89608966
CONFIG_TYPEC_MT6360=m
89618967
CONFIG_TYPEC_TCPCI_MAXIM=m
89628968
CONFIG_TYPEC_FUSB302=m
@@ -8979,7 +8985,7 @@ CONFIG_TYPEC_WUSB3801=m
89798985
# CONFIG_TYPEC_MUX_FSA4480 is not set
89808986
CONFIG_TYPEC_MUX_GPIO_SBU=m
89818987
# CONFIG_TYPEC_MUX_PI3USB30532 is not set
8982-
# CONFIG_TYPEC_MUX_IT5205 is not set
8988+
CONFIG_TYPEC_MUX_IT5205=m
89838989
CONFIG_TYPEC_MUX_NB7VPQ904M=m
89848990
# CONFIG_TYPEC_MUX_PTN36502 is not set
89858991
# CONFIG_TYPEC_MUX_WCD939X_USBSS is not set
@@ -9227,7 +9233,7 @@ CONFIG_INFINIBAND_CXGB4=m
92279233
# CONFIG_INFINIBAND_ERDMA is not set
92289234
CONFIG_INFINIBAND_HNS_HIP08=m
92299235
CONFIG_INFINIBAND_IRDMA=m
9230-
# CONFIG_MANA_INFINIBAND is not set
9236+
CONFIG_MANA_INFINIBAND=m
92319237
CONFIG_MLX4_INFINIBAND=m
92329238
CONFIG_MLX5_INFINIBAND=m
92339239
CONFIG_INFINIBAND_MTHCA=m
@@ -9440,9 +9446,9 @@ CONFIG_XGENE_DMA=m
94409446
# CONFIG_XILINX_ZYNQMP_DMA is not set
94419447
# CONFIG_XILINX_ZYNQMP_DPDMA is not set
94429448
# CONFIG_AMD_QDMA is not set
9443-
# CONFIG_MTK_HSDMA is not set
9449+
CONFIG_MTK_HSDMA=m
94449450
# CONFIG_MTK_CQDMA is not set
9445-
# CONFIG_MTK_UART_APDMA is not set
9451+
CONFIG_MTK_UART_APDMA=m
94469452
CONFIG_QCOM_BAM_DMA=m
94479453
CONFIG_QCOM_GPI_DMA=m
94489454
CONFIG_QCOM_HIDMA_MGMT=m
@@ -9560,6 +9566,7 @@ CONFIG_VHOST_SCSI=m
95609566
CONFIG_VHOST_VSOCK=m
95619567
CONFIG_VHOST_VDPA=m
95629568
# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
9569+
CONFIG_VHOST_ENABLE_FORK_OWNER_CONTROL=y
95639570

95649571
#
95659572
# Microsoft Hyper-V guest support
@@ -11277,6 +11284,8 @@ CONFIG_MST_IRQ=y
1127711284
# CONFIG_IPACK_BUS is not set
1127811285
CONFIG_ARCH_HAS_RESET_CONTROLLER=y
1127911286
CONFIG_RESET_CONTROLLER=y
11287+
CONFIG_RESET_BRCMSTB=y
11288+
CONFIG_RESET_BRCMSTB_RESCAL=y
1128011289
# CONFIG_RESET_GPIO is not set
1128111290
CONFIG_RESET_IMX7=m
1128211291
CONFIG_RESET_IMX8MP_AUDIOMIX=y
@@ -12219,9 +12228,9 @@ CONFIG_CRYPTO_ENGINE=m
1221912228
CONFIG_CRYPTO_RSA=y
1222012229
CONFIG_CRYPTO_DH=y
1222112230
CONFIG_CRYPTO_DH_RFC7919_GROUPS=y
12222-
CONFIG_CRYPTO_ECC=m
12231+
CONFIG_CRYPTO_ECC=y
1222312232
CONFIG_CRYPTO_ECDH=m
12224-
# CONFIG_CRYPTO_ECDSA is not set
12233+
CONFIG_CRYPTO_ECDSA=y
1222512234
CONFIG_CRYPTO_ECRDSA=m
1222612235
CONFIG_CRYPTO_CURVE25519=m
1222712236
# end of Public-key cryptography

0 commit comments

Comments
 (0)