[Glibc-bsd-commits] r4535 - in trunk/kfreebsd-downloader: . debian
rmh at alioth.debian.org
rmh at alioth.debian.org
Mon Jul 8 12:42:05 UTC 2013
Author: rmh
Date: 2013-06-19 18:01:27 +0000 (Wed, 19 Jun 2013)
New Revision: 4535
Added:
trunk/kfreebsd-downloader/debian/control.in
trunk/kfreebsd-downloader/debian/install.in
trunk/kfreebsd-downloader/fetch.sh
Removed:
trunk/kfreebsd-downloader/debian/control
trunk/kfreebsd-downloader/debian/install
Modified:
trunk/kfreebsd-downloader/debian/changelog
trunk/kfreebsd-downloader/debian/postinst.in
trunk/kfreebsd-downloader/debian/postrm.in
trunk/kfreebsd-downloader/debian/rules
Log:
Make it easier to upgrade by removing version number redundancy.
Modified: trunk/kfreebsd-downloader/debian/changelog
===================================================================
--- trunk/kfreebsd-downloader/debian/changelog 2013-06-19 17:59:50 UTC (rev 4534)
+++ trunk/kfreebsd-downloader/debian/changelog 2013-06-19 18:01:27 UTC (rev 4535)
@@ -1,3 +1,9 @@
+kfreebsd-downloader (9.0-4) UNRELEASED; urgency=low
+
+ * Make it easier to upgrade by removing version number redundancy.
+
+ -- Robert Millan <rmh at debian.org> Wed, 19 Jun 2013 15:39:55 +0200
+
kfreebsd-downloader (9.0-3) unstable; urgency=high
* Split versioned packages to make it possible to install multiple
Deleted: trunk/kfreebsd-downloader/debian/control
===================================================================
--- trunk/kfreebsd-downloader/debian/control 2013-06-19 17:59:50 UTC (rev 4534)
+++ trunk/kfreebsd-downloader/debian/control 2013-06-19 18:01:27 UTC (rev 4535)
@@ -1,43 +0,0 @@
-Source: kfreebsd-downloader
-Section: contrib/kernel
-Priority: extra
-Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
-Uploaders: Robert Millan <rmh at debian.org>
-Build-Depends: debhelper (>= 8.0)
-Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/kfreebsd-downloader/
-Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/kfreebsd-downloader/
-Standards-Version: 3.9.2
-
-Package: kfreebsd-downloader-9.0
-Architecture: kfreebsd-i386 kfreebsd-amd64
-Depends: ${misc:Depends},
- freebsd-utils (>= 8.1-5), kldutils (>= 8.2+ds3-1),
- devd | freebsd-utils (<< 8.2+ds2-9),
- wget, xz-utils,
-Breaks:
-# grub-probe versions prior to ada(4) support break postinst
- grub-common (<< 1.98+20100804-14+squeeze1),
-# AT_* macros break LD_PRELOAD (see #630695)
-# Missing support for RFTSIGZMB (see 007_clone_signals.diff)
- libc0.1 (<< 2.13-11),
-# Require ZFS v28 userland
- zfsutils (<< 8.3~),
-Provides: kfreebsd-image-9, kfreebsd-image
-Description: kernel of FreeBSD (upstream version)
- This package automatically downloads the latest upstream version of the
- kernel of FreeBSD, and installs it on your system.
- .
- Be warned that the upstream version of the kernel is NOT expected to work
- correctly on a Debian system. It is only provided for testing purposes.
-
-Package: kfreebsd-downloader-9
-Architecture: kfreebsd-i386 kfreebsd-amd64
-Depends: ${misc:Depends}, kfreebsd-downloader-9.0
-Description: kernel of FreeBSD (upstream version)
- This package depends on the latest downloader for kernel of FreeBSD 9.
-
-Package: kfreebsd-downloader
-Architecture: kfreebsd-i386 kfreebsd-amd64
-Depends: ${misc:Depends}, kfreebsd-downloader-9
-Description: kernel of FreeBSD (upstream version)
- This package depends on the latest downloader for kernel of FreeBSD.
Copied: trunk/kfreebsd-downloader/debian/control.in (from rev 4521, trunk/kfreebsd-downloader/debian/control)
===================================================================
--- trunk/kfreebsd-downloader/debian/control.in (rev 0)
+++ trunk/kfreebsd-downloader/debian/control.in 2013-06-19 18:01:27 UTC (rev 4535)
@@ -0,0 +1,43 @@
+Source: kfreebsd-downloader
+Section: contrib/kernel
+Priority: extra
+Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
+Uploaders: Robert Millan <rmh at debian.org>
+Build-Depends: debhelper (>= 8.0)
+Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/kfreebsd-downloader/
+Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/kfreebsd-downloader/
+Standards-Version: 3.9.2
+
+Package: kfreebsd-downloader- at VERSION@
+Architecture: kfreebsd-i386 kfreebsd-amd64
+Depends: ${misc:Depends},
+ freebsd-utils (>= 8.1-5), kldutils (>= 8.2+ds3-1),
+ devd | freebsd-utils (<< 8.2+ds2-9),
+ wget, xz-utils,
+Breaks:
+# grub-probe versions prior to ada(4) support break postinst
+ grub-common (<< 1.98+20100804-14+squeeze1),
+# AT_* macros break LD_PRELOAD (see #630695)
+# Missing support for RFTSIGZMB (see 007_clone_signals.diff)
+ libc0.1 (<< 2.13-11),
+# Require ZFS v28 userland
+ zfsutils (<< 8.3~),
+Provides: kfreebsd-image- at MAJOR@, kfreebsd-image
+Description: kernel of FreeBSD (upstream version)
+ This package automatically downloads the latest upstream version of the
+ kernel of FreeBSD, and installs it on your system.
+ .
+ Be warned that the upstream version of the kernel is NOT expected to work
+ correctly on a Debian system. It is only provided for testing purposes.
+
+Package: kfreebsd-downloader- at MAJOR@
+Architecture: kfreebsd-i386 kfreebsd-amd64
+Depends: ${misc:Depends}, kfreebsd-downloader- at VERSION@
+Description: kernel of FreeBSD (upstream version)
+ This package depends on the latest downloader for kernel of FreeBSD @MAJOR at .
+
+Package: kfreebsd-downloader
+Architecture: kfreebsd-i386 kfreebsd-amd64
+Depends: ${misc:Depends}, kfreebsd-downloader- at MAJOR@
+Description: kernel of FreeBSD (upstream version)
+ This package depends on the latest downloader for kernel of FreeBSD.
Deleted: trunk/kfreebsd-downloader/debian/install
===================================================================
--- trunk/kfreebsd-downloader/debian/install 2013-06-19 17:59:50 UTC (rev 4534)
+++ trunk/kfreebsd-downloader/debian/install 2013-06-19 18:01:27 UTC (rev 4535)
@@ -1 +0,0 @@
-MANIFEST.* usr/share/kfreebsd-downloader
Copied: trunk/kfreebsd-downloader/debian/install.in (from rev 4521, trunk/kfreebsd-downloader/debian/install)
===================================================================
--- trunk/kfreebsd-downloader/debian/install.in (rev 0)
+++ trunk/kfreebsd-downloader/debian/install.in 2013-06-19 18:01:27 UTC (rev 4535)
@@ -0,0 +1 @@
+MANIFEST.* usr/share/kfreebsd-downloader/@VERSION@
Modified: trunk/kfreebsd-downloader/debian/postinst.in
===================================================================
--- trunk/kfreebsd-downloader/debian/postinst.in 2013-06-19 17:59:50 UTC (rev 4534)
+++ trunk/kfreebsd-downloader/debian/postinst.in 2013-06-19 18:01:27 UTC (rev 4535)
@@ -19,16 +19,16 @@
PATH="/sbin:/bin:/usr/sbin:/usr/bin"
KERNEL_IMG_CONF="/etc/kernel-img.conf"
-MANIFEST="/usr/share/kfreebsd-downloader/MANIFEST. at ARCH@"
+MANIFEST="/usr/share/kfreebsd-downloader/@VERSION@/MANIFEST. at ARCH@"
case "$1" in
configure)
- cachedir="/var/cache/kfreebsd-downloader/@RELEASE@"
- moduledir="/lib/modules/@RELEASE@"
+ cachedir="/var/cache/kfreebsd-downloader/@VERSION at -RELEASE"
+ moduledir="/lib/modules/@VERSION at -RELEASE"
# Download
mkdir -p ${cachedir}
- wget http://ftp.freebsd.org/pub/FreeBSD/releases/@ARCH@/@ARCH@/@RELEASE@/kernel.txz \
+ wget http://ftp.freebsd.org/pub/FreeBSD/releases/@ARCH@/@ARCH@/@VERSION@-RELEASE/kernel.txz \
-c -O ${cachedir}/kernel.txz
# Verify
@@ -37,12 +37,12 @@
# Unpack
rm -rf ${moduledir}
mkdir -p ${moduledir}
- echo "Unpacking kFreeBSD @RELEASE@ ..." >&2
+ echo "Unpacking kFreeBSD @VERSION at -RELEASE ..." >&2
tar --strip-components=3 -C ${moduledir} -xJf ${cachedir}/kernel.txz
# Install kernel image
- gzip -9 < ${moduledir}/kernel > /boot/kfreebsd- at RELEASE@.gz
- rm -f ${moduledir}/@RELEASE@/kernel
+ gzip -9 < ${moduledir}/kernel > /boot/kfreebsd- at VERSION@-RELEASE.gz
+ rm -f ${moduledir}/@VERSION at -RELEASE/kernel
########################################################################
Modified: trunk/kfreebsd-downloader/debian/postrm.in
===================================================================
--- trunk/kfreebsd-downloader/debian/postrm.in 2013-06-19 17:59:50 UTC (rev 4534)
+++ trunk/kfreebsd-downloader/debian/postrm.in 2013-06-19 18:01:27 UTC (rev 4535)
@@ -23,7 +23,7 @@
case "$1" in
remove|purge|upgrade)
- rm -rf /lib/modules/@RELEASE@ /boot/kfreebsd- at RELEASE@.gz
+ rm -rf /lib/modules/@VERSION at -RELEASE /boot/kfreebsd- at VERSION@-RELEASE.gz
case "$1" in purge)
rm -rf /var/cache/kfreebsd-downloader ;;
Modified: trunk/kfreebsd-downloader/debian/rules
===================================================================
--- trunk/kfreebsd-downloader/debian/rules 2013-06-19 17:59:50 UTC (rev 4534)
+++ trunk/kfreebsd-downloader/debian/rules 2013-06-19 18:01:27 UTC (rev 4535)
@@ -4,18 +4,21 @@
#export DH_VERBOSE=1
DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-RELEASE = "9.0-RELEASE"
+MAJOR = 9
+VERSION = $(MAJOR).0
+
%:
dh $@
-debian/%: debian/%.in
+debian/%: debian/%.in debian/rules
sed \
- -e "s/@RELEASE@/$(RELEASE)/g" \
+ -e "s/@MAJOR@/$(MAJOR)/g" \
+ -e "s/@VERSION@/$(VERSION)/g" \
-e "s/@ARCH@/$(DEB_HOST_ARCH_CPU)/g" \
- < $^ > $@
+ < $< > $@
-override_dh_auto_build: debian/postinst debian/postrm
+override_dh_auto_build: debian/postinst debian/postrm debian/install
override_dh_auto_clean:
- rm -f debian/postinst debian/postrm
+ rm -f debian/postinst debian/postrm debian/install
Added: trunk/kfreebsd-downloader/fetch.sh
===================================================================
--- trunk/kfreebsd-downloader/fetch.sh (rev 0)
+++ trunk/kfreebsd-downloader/fetch.sh 2013-06-19 18:01:27 UTC (rev 4535)
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+version="9.0"
+
+for arch in i386 amd64 ; do
+ wget http://ftp.freebsd.org/pub/FreeBSD/releases/$arch/$arch/${version}-RELEASE/MANIFEST -O MANIFEST.$arch
+done
Property changes on: trunk/kfreebsd-downloader/fetch.sh
___________________________________________________________________
Added: svn:executable
+ *
More information about the Glibc-bsd-commits
mailing list