diff --git a/arch/arm64/configs/deepin_arm_desktop_defconfig b/arch/arm64/configs/deepin_arm_desktop_defconfig index be7aced8cd0a5..225bc80bfea93 100644 --- a/arch/arm64/configs/deepin_arm_desktop_defconfig +++ b/arch/arm64/configs/deepin_arm_desktop_defconfig @@ -1,5 +1,5 @@ # CONFIG_LOCALVERSION_AUTO is not set -CONFIG_BUILD_SALT="6.4.14-arm64-desktop-deepin" +CONFIG_BUILD_SALT="6.5.3-arm64-desktop-deepin" CONFIG_DEFAULT_HOSTNAME="(uos)" CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y diff --git a/arch/x86/configs/deepin_desktop_common_defconfig b/arch/x86/configs/deepin_desktop_common_defconfig index f3238bdea5aba..312aed0d4a46a 100644 --- a/arch/x86/configs/deepin_desktop_common_defconfig +++ b/arch/x86/configs/deepin_desktop_common_defconfig @@ -1,5 +1,5 @@ # CONFIG_LOCALVERSION_AUTO is not set -CONFIG_BUILD_SALT="6.4.14-amd64-desktop-deepin" +CONFIG_BUILD_SALT="6.5.3-amd64-desktop-deepin" CONFIG_KERNEL_ZSTD=y CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y diff --git a/debian/changelog b/debian/changelog index 428dbbdbdbe7f..d07edc0747ff7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -linux-upstream (6.4.14-54052-g3675f89fb6ca-1) beige; urgency=low +linux-upstream (6.5.3-g6129bf1e6849-1) apricot; urgency=low * Custom built Linux kernel. - -- deepin23 Tue, 12 Sep 2023 10:59:20 +0800 + -- matrix Thu, 14 Sep 2023 13:47:45 +0800 diff --git a/debian/control b/debian/control index 117b9720759a0..d0bc981a3428a 100644 --- a/debian/control +++ b/debian/control @@ -1,16 +1,16 @@ Source: linux-upstream Section: kernel Priority: optional -Maintainer: deepin23 +Maintainer: matrix Rules-Requires-Root: no Build-Depends: zstd, bc, debhelper, rsync, kmod, cpio, bison, flex, libelf-dev:native, libssl-dev:native Homepage: https://www.kernel.org/ -Package: linux-image-6.4.14 +Package: linux-image-6.5.3 Architecture: amd64 arm64 -Description: Linux kernel, version 6.4.14 +Description: Linux kernel, version 6.5.3 This package contains the Linux kernel, modules and corresponding other - files, version: 6.4.14. + files, version: 6.5.3. Package: linux-libc-dev Section: devel @@ -21,16 +21,16 @@ Description: Linux support headers for userspace development are used by the installed headers for GNU glibc and other system libraries. Multi-Arch: same -Package: linux-headers-6.4.14 +Package: linux-headers-6.5.3 Architecture: amd64 arm64 -Description: Linux kernel headers for 6.4.14 on amd64 - This package provides kernel header files for 6.4.14 on amd64 +Description: Linux kernel headers for 6.5.3 on amd64 + This package provides kernel header files for 6.5.3 on amd64 . This is useful for people who need to build external modules -Package: linux-image-6.4.14-dbg +Package: linux-image-6.5.3-dbg Section: debug Architecture: amd64 arm64 -Description: Linux kernel debugging symbols for 6.4.14 +Description: Linux kernel debugging symbols for 6.5.3 This package will come in handy if you need to debug the kernel. It provides all the necessary debug symbols for the kernel and its modules. diff --git a/debian/deepin/OWNERS b/debian/deepin/OWNERS new file mode 100644 index 0000000000000..e9ec91fe44a05 --- /dev/null +++ b/debian/deepin/OWNERS @@ -0,0 +1,25 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +reviewers: +- Zeno-sole +- tsic404 +- hudeng-go +- myml +- BLumia +- xzl01 +- UTsweetyfish +- Rabenda +- zccrs +- justforlxz +- Clansty +- chenchongbiao +- Avenger-285714 +- matrix-wsk +approvers: +- Zeno-sole +- xzl01 +- UTsweetyfish +- hudeng-go +- zccrs +- Avenger-285714 +- matrix-wsk diff --git a/debian/deepin/workflows.yml b/debian/deepin/workflows.yml new file mode 100644 index 0000000000000..b23af2e9427b6 --- /dev/null +++ b/debian/deepin/workflows.yml @@ -0,0 +1,36 @@ +test_build: + steps: + - link_package: + source_project: deepin:Develop:main + source_package: %{SCM_REPOSITORY_NAME} + target_project: deepin:CI:kernel + + - configure_repositories: + project: deepin:CI + repositories: + - name: deepin_develop + paths: + - target_project: deepin:CI + target_repository: deepin_develop + architectures: + - x86_64 + - aarch64 + + filters: + event: pull_request + +tag_build: + steps: + - trigger_services: + project: deepin:Unstable:main + package: %{SCM_REPOSITORY_NAME} + filters: + event: tag_push + +commit_build: + steps: + - trigger_services: + project: deepin:Develop:main + package: %{SCM_REPOSITORY_NAME} + filters: + event: push diff --git a/debian/files b/debian/files index 76ff8f5b4c2eb..e9d8e45d2950c 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -linux-upstream_6.4.14-54052-g3675f89fb6ca-1_source.buildinfo kernel optional +linux-upstream_6.5.3-g6129bf1e6849-1_source.buildinfo kernel optional diff --git a/debian/rules b/debian/rules index be515b91bb3ca..fba073571f6ad 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f srctree ?= . -KERNELRELEASE = 6.4.14 +KERNELRELEASE = 6.5.3 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null) ifneq (,$(filter amd64,$(DEB_HOST_ARCH))) BUILD_ARCH = x86