From f887c8c8f193aaebf5dc0d9ed08bf86e26fd8040 Mon Sep 17 00:00:00 2001 From: Metztli Information Technology Date: Fri, 5 Oct 2018 01:51:26 -0700 Subject: [PATCH] Reiser4 / GCC6 for Debian kernel packaging for stretch-backports --- debian/config/amd64/defines | 7 ++++--- debian/config/armel/defines | 2 +- debian/config/armhf/defines | 2 +- debian/config/config | 7 +++++++ debian/config/defines | 4 ++-- debian/config/hppa/defines | 2 +- debian/config/i386/defines | 7 ++++--- debian/config/s390x/defines | 2 +- debian/installer/amd64/ignore-dups | 0 debian/installer/amd64/modules/amd64/reiser4-modules | 1 + debian/installer/amd64/package-list | 3 +++ debian/installer/i386/ignore-dups | 0 debian/installer/i386/modules/i386/reiser4-modules | 1 + debian/installer/i386/package-list | 3 +++ debian/installer/modules/reiser4-modules | 1 + debian/installer/package-list | 7 +++++++ debian/templates/control.extra.in | 12 ++++++------ 17 files changed, 43 insertions(+), 18 deletions(-) create mode 100644 debian/installer/amd64/ignore-dups create mode 100644 debian/installer/amd64/modules/amd64/reiser4-modules create mode 100644 debian/installer/i386/ignore-dups create mode 100644 debian/installer/i386/modules/i386/reiser4-modules create mode 100644 debian/installer/modules/reiser4-modules diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines index 186acf383..859f2ac87 100644 --- a/debian/config/amd64/defines +++ b/debian/config/amd64/defines @@ -5,8 +5,10 @@ featuresets: kernel-arch: x86 [build] -debug-info: true +debug-info: false image-file: arch/x86/boot/bzImage +signed-modules: false +signed-code: false vdso: true [image] @@ -15,8 +17,7 @@ install-stem: vmlinuz breaks: xserver-xorg-input-vmmouse (<< 1:13.0.99) [relations] -gcc-7: gcc-7 (>= 7.2.0-20~) , gcc-7-x86-64-linux-gnu (>= 7.2.0-20~) -headers%gcc-7: linux-compiler-gcc-7-x86 (>= 4.14.17-1~) +headers%gcc-6: linux-compiler-gcc-6-x86 [amd64_description] hardware: 64-bit PCs diff --git a/debian/config/armel/defines b/debian/config/armel/defines index fa617f46a..0692c80ec 100644 --- a/debian/config/armel/defines +++ b/debian/config/armel/defines @@ -12,7 +12,7 @@ uncompressed-image-file: arch/arm/boot/Image install-stem: vmlinuz [relations] -headers%gcc-7: linux-compiler-gcc-7-arm +headers%gcc-6: linux-compiler-gcc-6-arm [marvell_description] hardware: Marvell Kirkwood/Orion diff --git a/debian/config/armhf/defines b/debian/config/armhf/defines index 30696f44e..ced4d8681 100644 --- a/debian/config/armhf/defines +++ b/debian/config/armhf/defines @@ -12,7 +12,7 @@ vdso: true install-stem: vmlinuz [relations] -headers%gcc-7: linux-compiler-gcc-7-arm +headers%gcc-6: linux-compiler-gcc-6-arm [armmp_description] hardware: ARMv7 multiplatform compatible SoCs diff --git a/debian/config/config b/debian/config/config index dd08a454b..0ffe35fd4 100644 --- a/debian/config/config +++ b/debian/config/config @@ -5382,6 +5382,13 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BINFMT_MISC=m CONFIG_COREDUMP=y +## +## Jose/Metztli IT 09-26-2018 +## file: fs/reiser4/Kconfig +## +CONFIG_REISER4_FS=m +# CONFIG_REISER4_DEBUG is not set + ## ## file: fs/btrfs/Kconfig ## diff --git a/debian/config/defines b/debian/config/defines index 213b38705..7555b5ea6 100644 --- a/debian/config/defines +++ b/debian/config/defines @@ -111,7 +111,7 @@ arches: sparc sparc64 x32 -compiler: gcc-7 +compiler: gcc-6 featuresets: none rt @@ -134,7 +134,7 @@ recommends: apparmor [relations] # compilers -gcc-7: gcc-7 , gcc-7-@gnu-type-package@ +gcc-6: gcc-6 , gcc-6-@gnu-type-package@ # initramfs-generators initramfs-fallback: linux-initramfs-tool diff --git a/debian/config/hppa/defines b/debian/config/hppa/defines index dc8d0a886..533e005ef 100644 --- a/debian/config/hppa/defines +++ b/debian/config/hppa/defines @@ -28,5 +28,5 @@ hardware: multiprocessor 64-bit PA-RISC hardware-long: HP PA-RISC 64-bit SMP systems with support for more than 4 GB RAM [relations] -gcc-7: gcc-7 , binutils-hppa64-linux-gnu , gcc-7-hppa64-linux-gnu , gcc-7-hppa-linux-gnu , binutils-hppa64-linux-gnu , gcc-7-hppa64-linux-gnu +gcc-6: gcc-6 , binutils-hppa64-linux-gnu , gcc-6-hppa64-linux-gnu , gcc-6-hppa-linux-gnu , binutils-hppa64-linux-gnu , gcc-6-hppa64-linux-gnu diff --git a/debian/config/i386/defines b/debian/config/i386/defines index e4b38f6e7..b1e5858ad 100644 --- a/debian/config/i386/defines +++ b/debian/config/i386/defines @@ -6,6 +6,8 @@ kernel-arch: x86 [build] image-file: arch/x86/boot/bzImage +signed-modules: false +signed-code: false vdso: true [description] @@ -20,15 +22,14 @@ install-stem: vmlinuz breaks: xserver-xorg-input-vmmouse (<< 1:13.0.99) [relations] -gcc-7: gcc-7 (>= 7.2.0-20~) , gcc-7-i686-linux-gnu (>= 7.2.0-20~) -headers%gcc-7: linux-compiler-gcc-7-x86 (>= 4.14.17-1~) +headers%gcc-6: linux-compiler-gcc-6-x86 [686_description] hardware: older PCs hardware-long: PCs with one or more processors not supporting PAE [686-pae_build] -debug-info: true +debug-info: false [686-pae_description] hardware: modern PCs diff --git a/debian/config/s390x/defines b/debian/config/s390x/defines index 47de62402..8dcf9fde1 100644 --- a/debian/config/s390x/defines +++ b/debian/config/s390x/defines @@ -12,7 +12,7 @@ bootloaders: s390-tools install-stem: vmlinuz [relations] -headers%gcc-7: linux-compiler-gcc-7-s390 +headers%gcc-6: linux-compiler-gcc-6-s390 [s390x_build] debug-info: true diff --git a/debian/installer/amd64/ignore-dups b/debian/installer/amd64/ignore-dups new file mode 100644 index 000000000..e69de29bb diff --git a/debian/installer/amd64/modules/amd64/reiser4-modules b/debian/installer/amd64/modules/amd64/reiser4-modules new file mode 100644 index 000000000..9373ef12f --- /dev/null +++ b/debian/installer/amd64/modules/amd64/reiser4-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/amd64/package-list b/debian/installer/amd64/package-list index e55a71031..ec9dbb3c3 100644 --- a/debian/installer/amd64/package-list +++ b/debian/installer/amd64/package-list @@ -3,6 +3,9 @@ # architecture, which is derived from the files in the modules directory. # It overwrites specifications from /usr/share/kernel-wedge/package-list. # +#Jose/Metztli IT 10-16-2017 reiser4 support +Package: reiser4-modules +Priority: standard Package: fat-modules Priority: standard diff --git a/debian/installer/i386/ignore-dups b/debian/installer/i386/ignore-dups new file mode 100644 index 000000000..e69de29bb diff --git a/debian/installer/i386/modules/i386/reiser4-modules b/debian/installer/i386/modules/i386/reiser4-modules new file mode 100644 index 000000000..9373ef12f --- /dev/null +++ b/debian/installer/i386/modules/i386/reiser4-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/i386/package-list b/debian/installer/i386/package-list index b92d69595..3db3bf824 100644 --- a/debian/installer/i386/package-list +++ b/debian/installer/i386/package-list @@ -3,6 +3,9 @@ # architecture, which is derived from the files in the modules directory. # It overwrites specifications from /usr/share/kernel-wedge/package-list. # +#Jose/Metztli IT 10-16-2017 reiser4 support +Package: reiser4-modules +Priority: standard Package: kernel-image Provides: rtc-modules, zlib-modules diff --git a/debian/installer/modules/reiser4-modules b/debian/installer/modules/reiser4-modules new file mode 100644 index 000000000..70ddae431 --- /dev/null +++ b/debian/installer/modules/reiser4-modules @@ -0,0 +1 @@ +reiser4 diff --git a/debian/installer/package-list b/debian/installer/package-list index 8fb6a3158..acb7dce62 100644 --- a/debian/installer/package-list +++ b/debian/installer/package-list @@ -123,6 +123,13 @@ Priority: standard Description: JFS filesystem support This package contains the JFS filesystem module for the kernel. +# Jose/Metztli IT 06-27-2018 added zlib-modules and compress-modules dependency +Package: reiser4-modules +Depends: kernel-image, crc-modules, zlib-modules, compress-modules +Priority: extra +Description: Reiser4 filesystem support + This package contains the Reiser4 filesystem module for the kernel. + Package: ntfs-modules Depends: kernel-image Priority: optional diff --git a/debian/templates/control.extra.in b/debian/templates/control.extra.in index cf68233de..4baff7d8d 100644 --- a/debian/templates/control.extra.in +++ b/debian/templates/control.extra.in @@ -1,24 +1,24 @@ -Package: linux-compiler-gcc-7-arm +Package: linux-compiler-gcc-6-arm Build-Profiles: -Depends: gcc-7, ${misc:Depends} +Depends: gcc-6, ${misc:Depends} Architecture: armel armhf Multi-Arch: foreign Description: Compiler for Linux on ARM (meta-package) This package depends on GCC of the appropriate version and architecture for Linux on armel and armhf. -Package: linux-compiler-gcc-7-s390 +Package: linux-compiler-gcc-6-s390 Build-Profiles: -Depends: gcc-7, ${misc:Depends} +Depends: gcc-6, ${misc:Depends} Architecture: s390 s390x Multi-Arch: foreign Description: Compiler for Linux on IBM zSeries (meta-package) This package depends on GCC of the appropriate version and architecture for Linux on s390 and s390x. -Package: linux-compiler-gcc-7-x86 +Package: linux-compiler-gcc-6-x86 Build-Profiles: -Depends: gcc-7 (>= 7.2.0-20~), ${misc:Depends} +Depends: gcc-6, ${misc:Depends} Architecture: amd64 i386 x32 Multi-Arch: foreign Description: Compiler for Linux on x86 (meta-package) -- 2.19.0