LINARO: better common package naming

Don't hardcode linux-linaro in debian/rules.d/0-commont-vars.mk
Don't rely on a sed script to get it right
Allow it to be set via a new optional file in $(DEBIAN)/rules.d/vars.mk

6 files changed, 12 insertions, 9 deletions

diff --git a/debian.linaro/control.d/flavour-control.stub b/debian.linaro/control.d/flavour-control.stub
index 89b89acce9fc..2a97b120d372 100644
--- a/debian.linaro/control.d/flavour-control.stub
+++ b/debian.linaro/control.d/flavour-control.stub
@@ -30,7 +30,7 @@ Pre-Depends: dpkg (>= 1.10.24)
 Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3), wireless-crda
 Conflicts: hotplug (<< 0.0.20040105-1)
 Recommends: BOOTLOADER
-Suggests: fdutils, SRCPKGNAME-doc-PKGVER | SRCPKGNAME-source-PKGVER, SRCPKGNAMENF-tools
+Suggests: fdutils, SRCPKGNAME-doc-PKGVER | SRCPKGNAME-source-PKGVER, COMMONSRCPKGNAME-tools
 Description: Linux kernel image for version PKGVER on DESC
  This package contains the Linux kernel image for version PKGVER on
  DESC.
diff --git a/debian.linaro/control.stub.in b/debian.linaro/control.stub.in
index 139bc32ea698..0666073fd0c0 100644
--- a/debian.linaro/control.stub.in
+++ b/debian.linaro/control.stub.in
@@ -19,7 +19,7 @@ Description: Header files related to Linux kernel version PKGVER
  that want the latest kernel headers. Please read
  /usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details
 
-Package: SRCPKGNAMENF-tools-PKGVER-ABINUM
+Package: COMMONSRCPKGNAME-tools-PKGVER-ABINUM
 Architecture: armel
 Section: devel
 Priority: optional
diff --git a/debian.linaro/rules.d/vars.mk b/debian.linaro/rules.d/vars.mk
new file mode 100644
index 000000000000..37044bc30753
--- /dev/null
+++ b/debian.linaro/rules.d/vars.mk
@@ -0,0 +1 @@
+common_src_pkg_name = linux-linaro
diff --git a/debian/rules b/debian/rules
index ac14860b38ab..0d87e2ccd936 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,7 +91,7 @@ $(DEBIAN)/control.stub: $(DEBIAN)/d-i/kernel-versions.in	\
 	  new=`echo $$i | sed 's/\.in$$//'`;					\
 	  cat $$i | sed -e 's/PKGVER/$(release)/g'                              \
 	        -e 's/ABINUM/$(abinum)/g'                                       \
-		-e 's/SRCPKGNAMENF/$(src_pkg_name_no_flavour)/g'          \
+		-e 's/COMMONSRCPKGNAME/$(common_src_pkg_name)/g'          \
 		-e 's/SRCPKGNAME/$(src_pkg_name)/g'                             \
 	  > $$new;								\
 	done
@@ -100,7 +100,7 @@ $(DEBIAN)/control.stub: $(DEBIAN)/d-i/kernel-versions.in	\
 	  $(SHELL) $(DROOT)/scripts/control-create $$i |			\
 		sed -e 's/PKGVER/$(release)/g'                                  \
 		-e 's/ABINUM/$(abinum)/g'                                       \
-		-e 's/SRCPKGNAMENF/$(src_pkg_name_no_flavour)/g'          \
+		-e 's/COMMONSRCPKGNAME/$(common_src_pkg_name)/g'          \
 		-e 's/SRCPKGNAME/$(src_pkg_name)/g'                             \
 		>> $(DEBIAN)/control.stub;					\
 	done
diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index 2467c47d4bb3..e2a9ce5c88f7 100644
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk
@@ -2,7 +2,9 @@
 # The source package name will be the first token from $(DEBIAN)/changelog
 #
 src_pkg_name=$(shell sed -n '1s/^\(.*\) (.*).*$$/\1/p' $(DEBIAN)/changelog)
-src_pkg_name_no_flavour=linux-linaro
+# Allow for overriding common_src_pkg_name when we have perflavour source packages
+-include $(DEBIAN)/rules.d/vars.mk
+common_src_pkg_name?=src_pkg_name
 
 # Get some version info
 series := maverick
@@ -149,7 +151,7 @@ do_doc_package_content=true
 ifeq ($(full_build),false)
 do_doc_package_content=false
 endif
-doc_pkg_name=$(src_pkg_name_no_flavour)-doc
+doc_pkg_name=$(common_src_pkg_name)-doc
 
 #
 # Similarly with the linux-source package, you need not build it as a developer. Its
@@ -176,8 +178,8 @@ do_tools?=true
 else
 do_tools?=false
 endif
-tools_pkg_name=$(src_pkg_name_no_flavour)-tools-$(abi_release)
-tools_common_pkg_name=$(src_pkg_name_no_flavour)-tools-common
+tools_pkg_name=$(common_src_pkg_name)-tools-$(abi_release)
+tools_common_pkg_name=$(common_src_pkg_name)-tools-common
 
 # The general flavour specific image package.
 do_flavour_image_package=true
diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk
index 89df267c24ec..5287aefaff88 100644
--- a/debian/rules.d/1-maintainer.mk
+++ b/debian/rules.d/1-maintainer.mk
@@ -52,7 +52,7 @@ updateportsconfigs defaultportsconfigs editportsconfigs genportsconfigs askconfi
 printenv:
 	dh_testdir
 	@echo "src package name  = $(src_pkg_name)"
-	@echo "src package name no flavour  = $(src_pkg_name_no_flavour)"
+	@echo "src package name no flavour  = $(common_src_pkg_name)"
 	@echo "release           = $(release)"
 	@echo "revisions         = $(revisions)"
 	@echo "revision          = $(revision)"