Source: gnumach Version: 2:1.4-12 Severity: normal Tags: patch User: [email protected] Usertags: hurd
Hi, Currently it is not possible to install multiple versions if gnumach, since the built images share the same names: gnumach-1.4-486.gz gnumach-1.4-486-dbg.gz gnumach-1.4-xen-486.gz gnumach-1.4-xen-486-dbg.gz With the attached path to debian/rules, these names become unique, enabling installation of multiple versions as is the case for GNU/Linux: gnumach-1.4-12-486.gz etc. Unless problems arise with reject from Debian's NEW-Queue when new versions are uploaded, it would be really appreciated to also have versions for kernels. If not accepted, maybe the patch can be modified to use the new naming scheme conditionally, so that custom built images can be installed in parallel to the stock versions: export CUSTOM_KERNEL=yes debian/rules: ifeq ($(CUSTOM_KERNEL),yes) DEB_VERSION := $(VERSION) endif
--- a/debian/rules.orig 2014-08-11 23:19:07.000000000 +0200 +++ b/debian/rules 2014-09-19 09:40:06.000000000 +0200 @@ -6,6 +6,7 @@ FULL_VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g') NOEPOCH_VERSION := $(shell echo $(FULL_VERSION) | sed -e 's/.*://g') +DEB_VERSION := $(NOEPOCH_VERSION) TAR_VERSION := $(shell echo $(NOEPOCH_VERSION) | sed -e 's/-.*//g') VERSION := $(shell echo $(TAR_VERSION) | sed -e 's/\.dfsg.*//g') MAJOR := $(shell echo $(VERSION) | sed -e 's/\..*//g') @@ -182,12 +183,12 @@ mkdir -p $(D_UDEB)/boot cp $(D)/boot/gnumach $(D_UDEB)/boot/ - mv $(D)/boot/gnumach $(D)/boot/gnumach-$(VERSION)-$(MACHINE) + mv $(D)/boot/gnumach $(D)/boot/gnumach-$(DEB_VERSION)-$(MACHINE) mkdir -p $(D_XEN_UDEB)/boot cp $(D_XEN)/boot/gnumach $(D_XEN_UDEB)/boot/ - mv $(D_XEN)/boot/gnumach $(D_XEN)/boot/gnumach-$(VERSION)-xen-$(MACHINE) - mv $(D_DBG)/boot/gnumach $(D_DBG)/boot/gnumach-$(VERSION)-$(MACHINE)-dbg - mv $(D_XEN_DBG)/boot/gnumach $(D_XEN_DBG)/boot/gnumach-$(VERSION)-xen-$(MACHINE)-dbg + mv $(D_XEN)/boot/gnumach $(D_XEN)/boot/gnumach-$(DEB_VERSION)-xen-$(MACHINE) + mv $(D_DBG)/boot/gnumach $(D_DBG)/boot/gnumach-$(DEB_VERSION)-$(MACHINE)-dbg + mv $(D_XEN_DBG)/boot/gnumach $(D_XEN_DBG)/boot/gnumach-$(DEB_VERSION)-xen-$(MACHINE)-dbg ifeq ($(DEB_HOST_ARCH_OS),hurd) for script in preinst prerm postinst postrm ; do \ @@ -238,12 +239,12 @@ dh_link -a dh_strip -a -N$(pkg_dbg) -N$(pkg_xen_dbg) dh_compress -a -N$(pkg) -N$(pkg_udeb) -N$(pkg_xen) -N$(pkg_xen_udeb) -N$(pkg_dbg) -N$(pkg_xen_dbg) - dh_compress -p$(pkg) boot/gnumach-$(VERSION)-$(MACHINE) + dh_compress -p$(pkg) boot/gnumach-$(DEB_VERSION)-$(MACHINE) dh_compress -p$(pkg_udeb) boot/gnumach - dh_compress -p$(pkg_xen) boot/gnumach-$(VERSION)-xen-$(MACHINE) + dh_compress -p$(pkg_xen) boot/gnumach-$(DEB_VERSION)-xen-$(MACHINE) dh_compress -p$(pkg_xen_udeb) boot/gnumach - dh_compress -p$(pkg_dbg) boot/gnumach-$(VERSION)-$(MACHINE)-dbg - dh_compress -p$(pkg_xen_dbg) boot/gnumach-$(VERSION)-xen-$(MACHINE)-dbg + dh_compress -p$(pkg_dbg) boot/gnumach-$(DEB_VERSION)-$(MACHINE)-dbg + dh_compress -p$(pkg_xen_dbg) boot/gnumach-$(DEB_VERSION)-xen-$(MACHINE)-dbg dh_fixperms -a dh_installdeb -a dh_gencontrol -a
