[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnumach] 01/01: Make DEB_BUILD_OPTIONS=custom produce custom-versioned
|
From: |
Samuel Thibault |
|
Subject: |
[gnumach] 01/01: Make DEB_BUILD_OPTIONS=custom produce custom-versioned packages |
|
Date: |
Wed, 24 Sep 2014 00:15:52 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch master
in repository gnumach.
commit 9646dc163d059ddd81f8d1231aa96e48bca87f6a
Author: Samuel Thibault <address@hidden>
Date: Wed Sep 24 02:15:08 2014 +0200
Make DEB_BUILD_OPTIONS=custom produce custom-versioned packages
* control: rename into control.in with 1.4 replaced with @version@, so
that...
* rules: ... make DEB_BUILD_OPTIONS=custom use the package version instead
of the upstream version. Thanks Svante Signell for the original patch.
---
debian/changelog | 4 +++
debian/control | 22 +++++++-------
debian/{control => control.in} | 22 +++++++-------
debian/gnumach-image-1.4-486-dbg.docs | 3 --
debian/gnumach-image-1.4-486-dbg.install | 1 -
debian/gnumach-image-1.4-486.docs | 3 --
debian/gnumach-image-1.4-486.install | 1 -
debian/gnumach-image-1.4-xen-486-dbg.docs | 2 --
debian/gnumach-image-1.4-xen-486-dbg.install | 1 -
debian/gnumach-image-1.4-xen-486.docs | 2 --
debian/gnumach-image-1.4-xen-486.install | 1 -
debian/kernel-image-1.4-486-di.install | 1 -
debian/kernel-image-1.4-xen-486-di.install | 1 -
debian/rules | 44 ++++++++++++++++++++++------
14 files changed, 61 insertions(+), 47 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b557bea..56fcf80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ gnumach (2:1.4-13) UNRELEASED; urgency=medium
* patches/git-gdb_hw_watch.patch: New patch to fix gdb using hardware
watches.
* Bump Standards-Version to 3.9.6 (no changes).
+ * control: rename into control.in with 1.4 replaced with @version@, so
+ that...
+ * rules: ... make DEB_BUILD_OPTIONS=custom use the package version instead
+ of the upstream version. Thanks Svante Signell for the original patch.
-- Samuel Thibault <address@hidden> Wed, 17 Sep 2014 01:51:31 +0200
diff --git a/debian/control b/debian/control
index 48c99a1..3e4beb7 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Package: gnumach-dbg
Section: debug
Priority: extra
Architecture: any-i386
-Depends: ${misc:Depends}, gnumach-image-1.4-486-dbg
+Depends: ${misc:Depends}, gnumach-image-1.4-13-486-dbg
Breaks: grub-pc (<< 1.98+20100527-1)
Description: Dummy transition package for gnumach-image-*-dbg
This is a dummy package to ease the transition to gnumach-image-*dbg
@@ -30,21 +30,21 @@ Description: Dummy transition package for
gnumach-image-*-dbg
Package: gnumach-image-1-486
Architecture: any-i386
-Depends: ${misc:Depends}, gnumach-image-1.4-486
+Depends: ${misc:Depends}, gnumach-image-1.4-13-486
Description: GNU version of the Mach microkernel
This package depends on the latest GNU Mach kernel for use on PCs
with a 486, Pentium or compatible processor.
Package: gnumach-image-1-xen-486
Architecture: any-i386
-Depends: ${misc:Depends}, gnumach-image-1.4-xen-486
+Depends: ${misc:Depends}, gnumach-image-1.4-13-xen-486
Description: GNU version of the Mach microkernel
This package depends on the latest GNU Mach kernel for use on PCs
with a 486, Pentium or compatible processor.
.
This kernel is for use in unprivileged (domU) Xen domains.
-Package: gnumach-image-1.4-486
+Package: gnumach-image-1.4-13-486
Architecture: any-i386
Depends: ${misc:Depends}, gnumach-common
Provides: gnumach-image
@@ -52,7 +52,7 @@ Breaks: libc0.3 (<< 2.10.1-3), hurd (<< 20120520-1),
xserver-xorg-core (<< 2:1.9
Description: GNU version of the Mach microkernel
This is the Utah Mach microkernel used by the Hurd.
-Package: gnumach-image-1.4-xen-486
+Package: gnumach-image-1.4-13-xen-486
Architecture: any-i386
Depends: ${misc:Depends}, gnumach-common
Provides: gnumach-image
@@ -62,8 +62,8 @@ Description: GNU version of the Mach microkernel for Xen
.
The version in this package is compiled with Xen support.
-Package: kernel-image-1.4-486-di
-XB-Kernel-Version: 1.4-486
+Package: kernel-image-1.4-13-486-di
+XB-Kernel-Version: 1.4-13-486
Package-Type: udeb
Provides: kernel-image, floppy-modules, ide-modules, input-modules,
scsi-modules, serial-modules
Section: debian-installer
@@ -74,8 +74,8 @@ Description: GNU version of the Mach microkernel for the
Debian installer
Installer boot images. It does _not_ provide a usable kernel for
your full Debian system.
-Package: kernel-image-1.4-xen-486-di
-XB-Kernel-Version: 1.4-xen-486
+Package: kernel-image-1.4-13-xen-486-di
+XB-Kernel-Version: 1.4-13-xen-486
Package-Type: udeb
Provides: kernel-image, input-modules
Section: debian-installer
@@ -86,7 +86,7 @@ Description: GNU version of the Mach microkernel for the
Debian installer
Installer boot images. It does _not_ provide a usable kernel for
your full Debian system.
-Package: gnumach-image-1.4-486-dbg
+Package: gnumach-image-1.4-13-486-dbg
Section: debug
Priority: extra
Provides: gnumach
@@ -100,7 +100,7 @@ Description: GNU version of the Mach microkernel for
debugging
gnumach package, except that it is not stripped and has the
kernel-level debugger compiled in.
-Package: gnumach-image-1.4-xen-486-dbg
+Package: gnumach-image-1.4-13-xen-486-dbg
Section: debug
Priority: extra
Provides: gnumach
diff --git a/debian/control b/debian/control.in
similarity index 90%
copy from debian/control
copy to debian/control.in
index 48c99a1..b187475 100644
--- a/debian/control
+++ b/debian/control.in
@@ -22,7 +22,7 @@ Package: gnumach-dbg
Section: debug
Priority: extra
Architecture: any-i386
-Depends: ${misc:Depends}, gnumach-image-1.4-486-dbg
+Depends: ${misc:Depends}, address@hidden@-486-dbg
Breaks: grub-pc (<< 1.98+20100527-1)
Description: Dummy transition package for gnumach-image-*-dbg
This is a dummy package to ease the transition to gnumach-image-*dbg
@@ -30,21 +30,21 @@ Description: Dummy transition package for
gnumach-image-*-dbg
Package: gnumach-image-1-486
Architecture: any-i386
-Depends: ${misc:Depends}, gnumach-image-1.4-486
+Depends: ${misc:Depends}, address@hidden@-486
Description: GNU version of the Mach microkernel
This package depends on the latest GNU Mach kernel for use on PCs
with a 486, Pentium or compatible processor.
Package: gnumach-image-1-xen-486
Architecture: any-i386
-Depends: ${misc:Depends}, gnumach-image-1.4-xen-486
+Depends: ${misc:Depends}, address@hidden@-xen-486
Description: GNU version of the Mach microkernel
This package depends on the latest GNU Mach kernel for use on PCs
with a 486, Pentium or compatible processor.
.
This kernel is for use in unprivileged (domU) Xen domains.
-Package: gnumach-image-1.4-486
+Package: address@hidden@-486
Architecture: any-i386
Depends: ${misc:Depends}, gnumach-common
Provides: gnumach-image
@@ -52,7 +52,7 @@ Breaks: libc0.3 (<< 2.10.1-3), hurd (<< 20120520-1),
xserver-xorg-core (<< 2:1.9
Description: GNU version of the Mach microkernel
This is the Utah Mach microkernel used by the Hurd.
-Package: gnumach-image-1.4-xen-486
+Package: address@hidden@-xen-486
Architecture: any-i386
Depends: ${misc:Depends}, gnumach-common
Provides: gnumach-image
@@ -62,8 +62,8 @@ Description: GNU version of the Mach microkernel for Xen
.
The version in this package is compiled with Xen support.
-Package: kernel-image-1.4-486-di
-XB-Kernel-Version: 1.4-486
+Package: address@hidden@-486-di
+XB-Kernel-Version: @address@hidden
Package-Type: udeb
Provides: kernel-image, floppy-modules, ide-modules, input-modules,
scsi-modules, serial-modules
Section: debian-installer
@@ -74,8 +74,8 @@ Description: GNU version of the Mach microkernel for the
Debian installer
Installer boot images. It does _not_ provide a usable kernel for
your full Debian system.
-Package: kernel-image-1.4-xen-486-di
-XB-Kernel-Version: 1.4-xen-486
+Package: address@hidden@-xen-486-di
+XB-Kernel-Version: @address@hidden
Package-Type: udeb
Provides: kernel-image, input-modules
Section: debian-installer
@@ -86,7 +86,7 @@ Description: GNU version of the Mach microkernel for the
Debian installer
Installer boot images. It does _not_ provide a usable kernel for
your full Debian system.
-Package: gnumach-image-1.4-486-dbg
+Package: address@hidden@-486-dbg
Section: debug
Priority: extra
Provides: gnumach
@@ -100,7 +100,7 @@ Description: GNU version of the Mach microkernel for
debugging
gnumach package, except that it is not stripped and has the
kernel-level debugger compiled in.
-Package: gnumach-image-1.4-xen-486-dbg
+Package: address@hidden@-xen-486-dbg
Section: debug
Priority: extra
Provides: gnumach
diff --git a/debian/gnumach-image-1.4-486-dbg.docs
b/debian/gnumach-image-1.4-486-dbg.docs
deleted file mode 100644
index 4b4e16d..0000000
--- a/debian/gnumach-image-1.4-486-dbg.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-README
-NEWS
-i386/README-Drivers
diff --git a/debian/gnumach-image-1.4-486-dbg.install
b/debian/gnumach-image-1.4-486-dbg.install
deleted file mode 100644
index 36ef4c3..0000000
--- a/debian/gnumach-image-1.4-486-dbg.install
+++ /dev/null
@@ -1 +0,0 @@
-boot
diff --git a/debian/gnumach-image-1.4-486.docs
b/debian/gnumach-image-1.4-486.docs
deleted file mode 100644
index 4b4e16d..0000000
--- a/debian/gnumach-image-1.4-486.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-README
-NEWS
-i386/README-Drivers
diff --git a/debian/gnumach-image-1.4-486.install
b/debian/gnumach-image-1.4-486.install
deleted file mode 100644
index 36ef4c3..0000000
--- a/debian/gnumach-image-1.4-486.install
+++ /dev/null
@@ -1 +0,0 @@
-boot
diff --git a/debian/gnumach-image-1.4-xen-486-dbg.docs
b/debian/gnumach-image-1.4-xen-486-dbg.docs
deleted file mode 100644
index 9eafbe1..0000000
--- a/debian/gnumach-image-1.4-xen-486-dbg.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README
-NEWS
diff --git a/debian/gnumach-image-1.4-xen-486-dbg.install
b/debian/gnumach-image-1.4-xen-486-dbg.install
deleted file mode 100644
index 36ef4c3..0000000
--- a/debian/gnumach-image-1.4-xen-486-dbg.install
+++ /dev/null
@@ -1 +0,0 @@
-boot
diff --git a/debian/gnumach-image-1.4-xen-486.docs
b/debian/gnumach-image-1.4-xen-486.docs
deleted file mode 100644
index 9eafbe1..0000000
--- a/debian/gnumach-image-1.4-xen-486.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README
-NEWS
diff --git a/debian/gnumach-image-1.4-xen-486.install
b/debian/gnumach-image-1.4-xen-486.install
deleted file mode 100644
index 36ef4c3..0000000
--- a/debian/gnumach-image-1.4-xen-486.install
+++ /dev/null
@@ -1 +0,0 @@
-boot
diff --git a/debian/kernel-image-1.4-486-di.install
b/debian/kernel-image-1.4-486-di.install
deleted file mode 100644
index 36ef4c3..0000000
--- a/debian/kernel-image-1.4-486-di.install
+++ /dev/null
@@ -1 +0,0 @@
-boot
diff --git a/debian/kernel-image-1.4-xen-486-di.install
b/debian/kernel-image-1.4-xen-486-di.install
deleted file mode 100644
index 36ef4c3..0000000
--- a/debian/kernel-image-1.4-xen-486-di.install
+++ /dev/null
@@ -1 +0,0 @@
-boot
diff --git a/debian/rules b/debian/rules
index 2eb8ce4..e8873d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,10 +7,14 @@
FULL_VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed -e
's/^.*: //g')
NOEPOCH_VERSION := $(shell echo $(FULL_VERSION) | sed -e 's/.*://g')
TAR_VERSION := $(shell echo $(NOEPOCH_VERSION) | sed -e 's/-.*//g')
-VERSION := $(shell echo $(TAR_VERSION) | sed -e 's/\.dfsg.*//g')
+UPSTREAM_VERSION := $(shell echo $(TAR_VERSION) | sed -e 's/\.dfsg.*//g')
+VERSION := $(UPSTREAM_VERSION)
MAJOR := $(shell echo $(VERSION) | sed -e 's/\..*//g')
DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+ifneq (,$(filter custom,$(DEB_BUILD_OPTIONS)))
+VERSION := $(NOEPOCH_VERSION)
+endif
MACHINE := 486
@@ -59,6 +63,16 @@ common_configure := \
--disable-pcmcia-group \
--disable-wireless-group
+debian/control: debian/control.stamp
+debian/control.stamp: debian/control.in
+ifneq (,$(filter custom,$(DEB_BUILD_OPTIONS)))
+ @echo Building a custom kernel: "$(VERSION)"
+else
+ @echo Building a stock kernel: "$(VERSION)"
+endif
+ sed -e 's/@version@/$(VERSION)/g' < $< > debian/control
+ touch $@
+
configure: configure.ac
autoreconf -fi
@@ -144,6 +158,8 @@ endif
clean:
dh_testdir
+
+ rm -f debian/control.stamp
rm -f machine
rm -rf build build-xen build-dbg build-xen-dbg $(D_UDEB) $(D_XEN_UDEB)
$(D_XEN) $(D_DBG) $(D_XEN_DBG)
@@ -204,7 +220,7 @@ endif
binary: binary-indep binary-arch
-binary-indep: install
+binary-indep: install debian/control.stamp
dh_testdir
dh_testroot
@@ -221,16 +237,24 @@ binary-indep: install
dh_md5sums -i
dh_builddeb -i
-binary-arch: install
+binary-arch: install debian/control.stamp
dh_testdir
dh_testroot
dh_install -a -N$(pkg_udeb) -N$(pkg_xen) -N$(pkg_xen_udeb) -N$(pkg_dbg)
-N$(pkg_xen_dbg) --sourcedir=$(D)
- dh_install -p$(pkg_udeb) --sourcedir=$(D_UDEB)
- dh_install -p$(pkg_xen) --sourcedir=$(D_XEN)
- dh_install -p$(pkg_xen_udeb) --sourcedir=$(D_XEN_UDEB)
- dh_install -p$(pkg_dbg) --sourcedir=$(D_DBG)
- dh_install -p$(pkg_xen_dbg) --sourcedir=$(D_XEN_DBG)
+ dh_install -p$(pkg) --sourcedir=$(D) boot
+ dh_install -p$(pkg_xen) --sourcedir=$(D_XEN) boot
+ifeq ($(DEB_HOST_ARCH_OS),hurd)
+ dh_install -p$(pkg_udeb) --sourcedir=$(D_UDEB) boot
+ dh_install -p$(pkg_xen_udeb) --sourcedir=$(D_XEN_UDEB) boot
+endif
+ dh_install -p$(pkg_dbg) --sourcedir=$(D_DBG) boot
+ dh_install -p$(pkg_xen_dbg) --sourcedir=$(D_XEN_DBG) boot
+
+ dh_installdocs -p$(pkg) README NEWS i386/README-Drivers
+ dh_installdocs -p$(pkg_xen) README NEWS
+ dh_installdocs -p$(pkg_dbg) README NEWS i386/README-Drivers
+ dh_installdocs -p$(pkg_xen_dbg) README NEWS
dh_installdocs -a
dh_installchangelogs -a -k ChangeLog
@@ -239,9 +263,11 @@ binary-arch: install
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_udeb) boot/gnumach
dh_compress -p$(pkg_xen) boot/gnumach-$(VERSION)-xen-$(MACHINE)
+ifeq ($(DEB_HOST_ARCH_OS),hurd)
+ dh_compress -p$(pkg_udeb) boot/gnumach
dh_compress -p$(pkg_xen_udeb) boot/gnumach
+endif
dh_compress -p$(pkg_dbg) boot/gnumach-$(VERSION)-$(MACHINE)-dbg
dh_compress -p$(pkg_xen_dbg) boot/gnumach-$(VERSION)-xen-$(MACHINE)-dbg
dh_fixperms -a
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/gnumach.git