package seems functional, but need to change versioning to make apt/r…

…eprepro happy
spoelstraethan · Jul 13, 2020 · f0ec049 · f0ec049
1 parent b16225f
commit f0ec049
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 7 deletions.
diff --git a/kernel/packages/prawnos-linux-image-armhf/README.md b/kernel/packages/prawnos-linux-image-armhf/README.md
@@ -4,3 +4,20 @@
 
 ## src
 - contains the debian folder which has the postinst script, and required debian control files
+
+
+## versioning
+
+prawnos linux kernel images have 3 version numbers, each representing a different type of change. This is to keep versioning organized, and to make the debian packaging system happy. 
+
+the format is: 
+`prawnos-linus-image-armhf_<upstream_kver>-<prawnos_kver>-<debian_package_ver>`
+
+upstream_kver changes with a new version of the linux kernel
+prawnos_kver changes when new patches are added or a config change occurs
+debian_package_ver changes anytime the package is rebuilt
+
+If the upstream and prawnos_kver didn't change, the orig.tar.gz will still have a different hash due to the process of compressing the files, so reprepro will complain. The blurb below explains what to do in this case.
+
+from https://www.debian.org/doc/debian-policy/ch-controlfields.html#files
+If a new Debian revision of a package is being shipped and no new original source archive is being distributed the .dsc must still contain the Files field entry for the original source archive package_upstream-version.orig.tar.gz, but the .changes file should leave it out. In this case the original source archive on the distribution site must match exactly, byte-for-byte, the original source archive which was used to generate the .dsc file and diff which are being uploaded.
diff --git a/kernel/packages/prawnos-linux-image-armhf/src/debian/changelog b/kernel/packages/prawnos-linux-image-armhf/src/debian/changelog
@@ -1,4 +1,4 @@
-prawnos-linux-image-armhf (5.4.29-1) stable; urgency=medium
+prawnos-linux-image-armhf (5.4.29-1-1) stable; urgency=medium
 
   * Initial packaged release.
 

diff --git a/kernel/packages/prawnos-linux-image-armhf/src/debian/postinst b/kernel/packages/prawnos-linux-image-armhf/src/debian/postinst
@@ -2,7 +2,7 @@
 
 
 VERSION=__DEB_VERSION__
-KERNEL_IMAGE := /boot/prawnos-linux-image-armhf_$VERSION_armhf
+KERNEL_IMAGE=/boot/prawnos-linux-image-armhf_$VERSION_armhf
 
 set -e
 

diff --git a/kernel/packages/prawnos-linux-image-armhf/src/debian/rules b/kernel/packages/prawnos-linux-image-armhf/src/debian/rules
@@ -3,7 +3,7 @@
 	dh $@
 
 override_dh_installdeb:
-    dh_installdeb
-    for pkg in $$(dh_listpackages -i); do \
-        sed -i -e 's/__DEB_VERSION__/$(DEB_VERSION)/' debian/$$pkg/DEBIAN/*; \
-    done
+	dh_installdeb
+	for pkg in $$(dh_listpackages -i); do \
+		sed -i -e 's/__DEB_VERSION__/$(DEB_VERSION)/' debian/$$pkg/DEBIAN/*; \
+	done
diff --git a/scripts/BuildScripts/BuildCommon.mk b/scripts/BuildScripts/BuildCommon.mk
@@ -6,7 +6,7 @@ BUILD_COMMON_MK := 1
 ### MISC GLOBALS
 KVER=5.4.29
 # the number of prawnos specific releases made of the above kver. Used for the kernel deb packages
-PRAWNOS_KERNEL_RELEASE=1
+PRAWNOS_KERNEL_RELEASE=2
 DEBKVER=$(KVER)-$(PRAWNOS_KERNEL_RELEASE)
 # Otherwise errors are ignored when output is piped to tee:
 SHELL := /bin/bash -o pipefail

diff --git a/scripts/BuildScripts/PackageScripts/uploadPackage.sh b/scripts/BuildScripts/PackageScripts/uploadPackage.sh
@@ -21,4 +21,14 @@ set -e
 # along with PrawnOS.  If not, see <https://www.gnu.org/licenses/>.
 
 
+#example ~/.dput.cf
+# [deb.prawnos.com]
+# fqdn = deb.prawnos.com
+# method = scp
+# login = debian
+# incoming = /var/www/repos/apt/debian/incoming
+# allow_unsigned_uploads = true
+# ssh_config_options = Port=2222
+
+
 dput deb.prawnos.com *.changes
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     VERSION=__DEB_VERSION__
-    KERNEL_IMAGE := /boot/prawnos-linux-image-armhf_$VERSION_armhf
+    KERNEL_IMAGE=/boot/prawnos-linux-image-armhf_$VERSION_armhf
     set -e
@@ Expand Down @@