From 5dd1f6569d45a01be63ce85ae0b86cffcbae88f1 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Sat, 07 Nov 2020 04:25:32 -0500
Subject: 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(-)
---
(limited to 'build')

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
--
cgit v0.9.1