Patches for bionic

Author: jackpot51

debian.master/config/amd64/config.common.amd64

@@ -273,8 +273,8 @@ CONFIG_JFS_FS=m
 CONFIG_JME=m
 CONFIG_JUMP_LABEL=y
 CONFIG_KARMA_PARTITION=y
-# CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_LZ4=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_XZ is not set
 CONFIG_KEXEC_FILE=y
 CONFIG_KEYBOARD_GPIO=m
 CONFIG_KVM=m

debian.master/config/s390x/config.common.s390x

@@ -257,7 +257,7 @@ CONFIG_IRQ_BYPASS_MANAGER=m
 CONFIG_JUMP_LABEL=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_LZ4=y
+CONFIG_KERNEL_XZ=y
 # CONFIG_KEXEC_FILE is not set
 CONFIG_KVM=y
 # CONFIG_LAPB is not set

debian.master/control.stub.in

@@ -34,10 +34,11 @@ Build-Depends:
  automake <!stage1>,
  libtool <!stage1>,
  uuid-dev <!stage1>,
+ binutils-dev <!stage1>,
  libnuma-dev [amd64 arm64 ppc64el s390x] <!stage1>,
  dkms <!stage1>,
  wget <!stage1>,
- lz4 [amd64 s390x] <!stage1>,
+ spl-dkms <!stage1>,
 Build-Depends-Indep:
  xmlto <!stage1>,
  docbook-utils <!stage1>,

system76.sh

@@ -8,15 +8,16 @@ then
     exit 1
 fi
 
-package="$(dpkg-parsechangelog --file debian.master/changelog --show-field Source)"
+package="$(dpkg-parsechangelog --file "debian.master/changelog" --show-field Source)"
 version="$(dpkg-parsechangelog --file "debian.master/changelog" --show-field Version)"
+distribution="$(dpkg-parsechangelog --file "debian.master/changelog" --show-field Distribution)"
 
 if [[ "${version}" == *"+system76"* ]]
 then
     echo "${package} ${version} already updated for system76"
 else
     new_version="${version}+system76"
-    sed -i "s/${package} (${version})/${package} (${new_version})/" "debian.master/changelog"
+    sed -i "s/${package} (${version}) ${distribution}/${package} (${new_version}) bionic/" "debian.master/changelog"
     dch --changelog "debian.master/changelog" --release 'Release for System76'
 fi