Version package names

Diffstat with similarity index set to 24%:

     basever.mk                                                            |  1 +
     build                                                                 | 25 +++++++++++++------------
     changelog                                                             |  4 +++-
     {linux-common.pkg => linux-common-4.19.pkg}/control                   |  5 +++--
     {linux-common.pkg => linux-common-4.19.pkg}/docs                      |  0
     {linux-image.pkg => linux-image-4.19.pkg}/control                     |  6 +++---
     {linux-image.pkg => linux-image-4.19.pkg}/postinst                    |  0
     {linux-image.pkg => linux-image-4.19.pkg}/postrm                      |  0
     {linux-image.pkg => linux-image-4.19.pkg}/preinst                     |  0
     {linux-image.pkg => linux-image-4.19.pkg}/prerm                       |  0
     {linux-libc-dev.pkg => linux-libc-dev-4.19.pkg}/control               |  4 ++--
     {linux-libc-dev-common.pkg => linux-libc-dev-common-4.19.pkg}/control |  2 +-
     {linux-sysmap.pkg => linux-sysmap-4.19.pkg}/control                   |  7 ++++---
     setver                                                                | 17 +++++++++++++++++
     substvars                                                             |  1 +
     15 files changed, 48 insertions(+), 24 deletions(-)

18 files changed, 58 insertions, 34 deletions

diff --git a/basever.mk b/basever.mk
new file mode 100644
index 0000000..0bde6f2
--- /dev/null
+++ b/basever.mk
@@ -0,0 +1 @@
+VER = 4.19
diff --git a/build b/build
index 870164f..0c8fb2a 100755
--- a/build
+++ b/build
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 include ../source.mk
+include ../basever.mk
 
 V = 1
 KBUILD_ARCH = $$(oh-architecture "$${OPK_HOST_ARCH}")
@@ -43,21 +44,21 @@ install: build
 	if [ 'x$(OPK_HOST_PLAT)' != 'xdev' ]; then \
 		read img_src img_dest <image; \
 		install -D "src/arch/$(KBUILD_ARCH)/boot/$${img_src}" \
-			linux-image.data/boot/$${img_dest}; \
-		ln -sf /boot/$${img_dest} linux-image.data/$${img_dest}; \
+			linux-image-$(VER).data/boot/$${img_dest}; \
+		ln -sf /boot/$${img_dest} linux-image-$(VER).data/$${img_dest};\
 		install -D src/System.map \
-			linux-sysmap.data/boot/System.map; \
-		mkdir -p linux-image.data/etc/kernel/preinst.d \
-			linux-image.data/etc/kernel/postinst.d \
-			linux-image.data/etc/kernel/prerm.d \
-			linux-image.data/etc/kernel/postrm.d; \
+			linux-sysmap-$(VER).data/boot/System.map; \
+		mkdir -p linux-image-$(VER).data/etc/kernel/preinst.d \
+			linux-image-$(VER).data/etc/kernel/postinst.d \
+			linux-image-$(VER).data/etc/kernel/prerm.d \
+			linux-image-$(VER).data/etc/kernel/postrm.d; \
 	fi
 	oh-autoinstall -T headers_install -- \
-		INSTALL_HDR_PATH="$${PWD}/linux-libc-dev-common.data/usr"
-	find linux-libc-dev-common.data/usr/include \
+		INSTALL_HDR_PATH="$${PWD}/linux-libc-dev-common-$(VER).data/usr"
+	find linux-libc-dev-common-$(VER).data/usr/include \
 		\( -name .install -o -name ..install.cmd \
 		-o -name .check -o -name ..check.cmd \) \
 		-a -exec rm -f '{}' ';'
-	mkdir linux-libc-dev.data/usr/include/$(OPK_HOST_ARCH)
-	mv linux-libc-dev-common.data/usr/include/asm \
-		linux-libc-dev.data/usr/include/$(OPK_HOST_ARCH)/asm
+	mkdir linux-libc-dev-$(VER).data/usr/include/$(OPK_HOST_ARCH)
+	mv linux-libc-dev-common-$(VER).data/usr/include/asm \
+		linux-libc-dev-$(VER).data/usr/include/$(OPK_HOST_ARCH)/asm
diff --git a/changelog b/changelog
index 70a6b6c..dbdf958 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,7 @@ linux-libre-4.19 (4.19.56+gnu-1) trunk
     - Drop patches/01_no-bash.patch, issue fixed upstream.
     - Add patch to build with BusyBox < 1.22.0.
     - New build dependencies: bison, flex.
+    - Add "-4.19" to the end of binary package names.
   * Update Maintainer and Homepage.
   * Regenerate M+ fonts from M+ version 063a using otf2bdf and bdf2fbcon and
     rebase patch onto new upstream Linux-libre.
@@ -15,7 +16,8 @@ linux-libre-4.19 (4.19.56+gnu-1) trunk
   * Add libncurses.6-dev and terminfo to Build-Depends for convenience when
     building and running upstream mconf (menuconfig).
   * Organize packages into sections.
-    - Split architecture-independent headers into new linux-libc-dev package.
+    - Split architecture-independent headers into new linux-libc-dev-4.19
+      package.
 
  -- Patrick McDermott <patrick.mcdermott@libiquity.com>  Fri, 28 Jun 2019 18:50:56 -0400
 
diff --git a/linux-common-4.19.pkg/control b/linux-common-4.19.pkg/control
new file mode 100644
index 0000000..b1cab74
--- /dev/null
+++ b/linux-common-4.19.pkg/control
@@ -0,0 +1,6 @@
+Architecture: all
+Platform: all
+Section: share
+Description: Linux-libre ${Base-Version} common files
+ This package provides documentation for the linux-libre-${Base-Version} source
+ package.
diff --git a/linux-common.pkg/docs b/linux-common-4.19.pkg/docs
index e69de29..e69de29 100644
--- a/linux-common.pkg/docs
+++ b/linux-common-4.19.pkg/docs
diff --git a/linux-common.pkg/control b/linux-common.pkg/control
deleted file mode 100644
index 5fdf051..0000000
--- a/linux-common.pkg/control
+++ /dev/null
@@ -1,5 +0,0 @@
-Architecture: all
-Platform: all
-Section: share
-Description: Linux-libre common files
- This package provides documentation for the linux-libre source package.
diff --git a/linux-image-4.19.pkg/control b/linux-image-4.19.pkg/control
new file mode 100644
index 0000000..c8bcd41
--- /dev/null
+++ b/linux-image-4.19.pkg/control
@@ -0,0 +1,7 @@
+Architecture: any-linux-any
+Platform: !dev
+Essential: yes
+Section: boot
+Depends: linux-common-${Base-Version} (= ${Source-Version}),
+Description: Linux-libre ${Base-Version}
+ This package provides a Linux-libre ${Base-Version} kernel image.
diff --git a/linux-image.pkg/postinst b/linux-image-4.19.pkg/postinst
index 9b615b4..9b615b4 100644
--- a/linux-image.pkg/postinst
+++ b/linux-image-4.19.pkg/postinst
diff --git a/linux-image.pkg/postrm b/linux-image-4.19.pkg/postrm
index ca0e0cb..ca0e0cb 100644
--- a/linux-image.pkg/postrm
+++ b/linux-image-4.19.pkg/postrm
diff --git a/linux-image.pkg/preinst b/linux-image-4.19.pkg/preinst
index 881ea9b..881ea9b 100644
--- a/linux-image.pkg/preinst
+++ b/linux-image-4.19.pkg/preinst
diff --git a/linux-image.pkg/prerm b/linux-image-4.19.pkg/prerm
index 7bc5761..7bc5761 100644
--- a/linux-image.pkg/prerm
+++ b/linux-image-4.19.pkg/prerm
diff --git a/linux-image.pkg/control b/linux-image.pkg/control
deleted file mode 100644
index 6c4ac5b..0000000
--- a/linux-image.pkg/control
+++ /dev/null
@@ -1,7 +0,0 @@
-Architecture: any-linux-any
-Platform: !dev
-Essential: yes
-Section: boot
-Depends: linux-common (= ${Source-Version})
-Description: Linux image
- This package provides a Linux kernel image.
diff --git a/linux-libc-dev.pkg/control b/linux-libc-dev-4.19.pkg/control
index ed84f5a..aa1ce28 100644
--- a/linux-libc-dev.pkg/control
+++ b/linux-libc-dev-4.19.pkg/control
@@ -1,8 +1,8 @@
 Architecture: any-linux-any
 Platform: all
 Section: libdev
-Depends: linux-common (= ${Source-Version}),
- linux-libc-dev-common (= ${Source-Version}),
+Depends: linux-common-${Base-Version} (= ${Source-Version}),
+ linux-libc-dev-common-${Base-Version} (= ${Source-Version}),
 Description: Linux support headers for userspace development
  This package provides headers that define interfaces for userspace libraries
  and programs.  These headers are used by BusyBox and the C library, for
diff --git a/linux-libc-dev-common.pkg/control b/linux-libc-dev-common-4.19.pkg/control
index 457fea8..b1d8c32 100644
--- a/linux-libc-dev-common.pkg/control
+++ b/linux-libc-dev-common-4.19.pkg/control
@@ -1,7 +1,7 @@
 Architecture: all
 Platform: all
 Section: share
-Depends: linux-common (= ${Source-Version})
+Depends: linux-common-${Base-Version} (= ${Source-Version}),
 Description: Linux support headers for userspace development - arch-independent
  This package provides headers that define interfaces for userspace libraries
  and programs.  These headers are used by BusyBox and the C library, for
diff --git a/linux-sysmap-4.19.pkg/control b/linux-sysmap-4.19.pkg/control
new file mode 100644
index 0000000..668929d
--- /dev/null
+++ b/linux-sysmap-4.19.pkg/control
@@ -0,0 +1,7 @@
+Architecture: any-linux-any
+Platform: !dev
+Section: boot
+Depends: linux-common-${Base-Version} (= ${Source-Version}),
+ linux-image-${Base-Version} (= ${Binary-Version}),
+Description: Linux-libre ${Base-Version} symbol table
+ This package provides a System.map symbol table file for the Linux-libre image.
diff --git a/linux-sysmap.pkg/control b/linux-sysmap.pkg/control
deleted file mode 100644
index ad4e07a..0000000
--- a/linux-sysmap.pkg/control
+++ /dev/null
@@ -1,6 +0,0 @@
-Architecture: any-linux-any
-Platform: !dev
-Section: boot
-Depends: linux-common (= ${Source-Version}), linux-image (= ${Binary-Version})
-Description: Linux symbol table
- This package provides a System.map symbol table file for the Linux image.
diff --git a/setver b/setver
new file mode 100755
index 0000000..14efac1
--- /dev/null
+++ b/setver
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -eu
+
+OPK_SOURCE="$(sed 's/ .*//; q;' changelog)"
+BASE_VERSION="${OPK_SOURCE#linux-libre-}"
+GIT=''
+[ -d .git/ ] && GIT='git'
+
+for pkg in *.pkg/; do
+	${GIT} mv "${pkg}" "${pkg%-*.pkg/}-${BASE_VERSION}.pkg/"
+done
+
+printf 'VER = %s\n' "${BASE_VERSION}" 1>basever.mk
+mv substvars substvars~
+sed "s/^Base-Version:.*$/Base-Version: ${BASE_VERSION}/" substvars~ 1>substvars
+rm substvars~
diff --git a/substvars b/substvars
new file mode 100644
index 0000000..3874808
--- /dev/null
+++ b/substvars
@@ -0,0 +1 @@
+Base-Version: 4.19