Hi Cyril,
On Tue, Jun 27, 2017 at 09:24:03PM +0200, Cyril Brulebois wrote:
> Hi Guido,
>
> Guido Günther <a...@sigxcpu.org> (2017-06-27):
> > One thing that just crossed my mind: should we delay this update for
> > Jessie past the first stretch point release. I would then change the
> > patch to use an URL for stretch from
> >
> > http://cdimage.debian.org/mirror/cdimage/archive/9.0.0
> >
> > instead of
> >
> > http://cdimage.debian.org/mirror/cdimage/release/<changing-part>
> >
> > so we have a stable URL that doesn't break with every stretch point
> > release asking for further updates? Sorry for not thinking about this
> > earlier.
>
> It's likely we'll release 8.9 & 9.1 during the same week-end. So maybe
> you could include this change right away? It would only be an annoyance
> for people fetching the updated package “in advance” from the
> jessie-proposed-updates suite? But then, we don't have stretch support
> at all right now, so that's not even a regression.
Great. See new debdiff attached. I've also attached the diff with
patches applied for the relevant part of the debian.xml.in
(url-change.diff). For the sake of completeness: I've also changed
debian/gbp.conf to point to debian/jessie so gbp picks up the right
chroot withou further typing.
Tested on Jessie:
$ osinfo-detect debian-9.0.0-amd64-netinst.iso
Media is bootable.
Media is an installer for OS 'Debian Stretch'
O.k. to upload to jessie-p-u?
Cheers,
-- Guido
>
> > Regarding the tests:
> >
> > Things are split up in stretch so that tests/ are in libosinfo while the
> > data is in osinfo-db:
> >
> >
> > https://gitlab.com/agx1/libosinfo/commit/117029715f90c5c7a2f2a996b21e9fefca6585c8
> >
> > and I deemed updating libosifo in stretch as well only for the tests
> > overkill (but I ran them there as well).
>
> (Just to be clear: I was really enjoying seeing tests get added.)
>
>
> KiBi.
diff --git a/data/oses/debian.xml.in b/data/oses/debian.xml.in
index 5924850..73bc327 100644
--- a/data/oses/debian.xml.in
+++ b/data/oses/debian.xml.in
@@ -334,7 +334,7 @@
</resources>
<media arch="i686">
- <url>http://cdimage.debian.org/cdimage/release/current/i386/iso-cd/debian-9.0.0-i386-netinst.iso</url>
+ <url>http://cdimage.debian.org/mirror/cdimage/archive/9.0.0/i386/iso-cd/debian-9.0.0-i386-netinst.iso</url>
<iso>
<volume-id>Debian 9.\d.\d i386 (1|n)</volume-id>
</iso>
@@ -342,7 +342,7 @@
<initrd>install.386/initrd.gz</initrd>
</media>
<media arch="x86_64">
- <url>http://cdimage.debian.org/cdimage/release/current/amd64/iso-cd/debian-9.0.0-amd64-netinst.iso</url>
+ <url>http://cdimage.debian.org/mirror/cdimage/archive/9.0.0/amd64/iso-cd/debian-9.0.0-amd64-netinst.iso</url>
<iso>
<volume-id>Debian 9.\d.\d amd64 (1|n)</volume-id>
</iso>
diff --git a/debian/changelog b/debian/changelog
index 45f9af0..10d7772 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libosinfo (0.2.11-2) jessie; urgency=medium
+
+ * [4b4388e] Add Debian Jessie and Stretch
+ * [335f18d] Adjust gbp.conf for Debian Jessie
+
+ -- Guido Günther <a...@sigxcpu.org> Wed, 28 Jun 2017 19:06:22 +0200
+
libosinfo (0.2.11-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 4b41283..9103184 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,4 @@
[DEFAULT]
-debian-branch = debian/sid
+debian-branch = debian/jessie
upstream-tag = v%(version)s
upstream-branch = upstream/master
diff --git a/debian/patches/Add-Debian-Jessie-and-Stretch.patch b/debian/patches/Add-Debian-Jessie-and-Stretch.patch
new file mode 100644
index 0000000..fd7e856
--- /dev/null
+++ b/debian/patches/Add-Debian-Jessie-and-Stretch.patch
@@ -0,0 +1,242 @@
+From: =?utf-8?q?Guido_G=C3=BCnther?= <a...@sigxcpu.org>
+Date: Wed, 21 Jun 2017 08:36:07 +0200
+Subject: Add Debian Jessie and Stretch
+
+---
+ data/oses/debian.xml.in | 100 ++++++++++++++++++++-
+ .../debian/debian8/debian-8.7.1-amd64-CD-1.iso.txt | 29 ++++++
+ .../debian9/debian-9.0-amd64-netinst.iso.txt | 29 ++++++
+ .../debian/debian9/debian-9.0-amd64.iso.txt | 29 ++++++
+ 4 files changed, 185 insertions(+), 2 deletions(-)
+ create mode 100644 test/isodata/debian/debian8/debian-8.7.1-amd64-CD-1.iso.txt
+ create mode 100644 test/isodata/debian/debian9/debian-9.0-amd64-netinst.iso.txt
+ create mode 100644 test/isodata/debian/debian9/debian-9.0-amd64.iso.txt
+
+diff --git a/data/oses/debian.xml.in b/data/oses/debian.xml.in
+index 61d4d52..73bc327 100644
+--- a/data/oses/debian.xml.in
++++ b/data/oses/debian.xml.in
+@@ -238,7 +238,7 @@
+ </resources>
+
+ <media arch="i686">
+- <url>http://cdimage.debian.org/debian-cd/7.3.0/i386/iso-dvd/debian-7.3.0-i386-DVD-1.iso</url>
++ <url>http://cdimage.debian.org/mirror/cdimage/archive/7.11.0/i386/iso-dvd/debian-7.11.0-i386-DVD-1.iso</url>
+ <iso>
+ <volume-id>Debian 7.\d.\d i386 1</volume-id>
+ </iso>
+@@ -246,7 +246,7 @@
+ <initrd>install.386/initrd.gz</initrd>
+ </media>
+ <media arch="x86_64">
+- <url>http://cdimage.debian.org/debian-cd/7.3.0/amd64/iso-dvd/debian-7.3.0-amd64-DVD-1.iso</url>
++ <url>http://cdimage.debian.org/mirror/cdimage/archive/7.11.0/amd64/iso-dvd/debian-7.11.0-amd64-DVD-1.iso</url>
+ <iso>
+ <volume-id>Debian 7.\d.\d amd64 1</volume-id>
+ </iso>
+@@ -260,4 +260,100 @@
+ </installer>
+ </os>
+
++ <os id="http://debian.org/debian/8";>
++ <short-id>debian8</short-id>
++ <short-id>debianjessie</short-id>
++ <_name>Debian Jessie</_name>
++ <version>8</version>
++ <_vendor>Debian Project</_vendor>
++ <family>linux</family>
++ <distro>debian</distro>
++ <upgrades id="http://debian.org/debian/7"/>
++ <derives-from id="http://debian.org/debian/7"/>
++
++ <resources arch="all">
++ <minimum>
++ <cpu>1000000000</cpu>
++ <n-cpus>1</n-cpus>
++ <ram>134217728</ram>
++ <storage>5368709120</storage>
++ </minimum>
++ <recommended>
++ <cpu>1000000000</cpu>
++ <ram>1073741824</ram>
++ <storage>21474836480</storage>
++ </recommended>
++ </resources>
++
++ <media arch="i686">
++ <url>http://cdimage.debian.org/mirror/cdimage/archive/8.8.0/i386/iso-dvd/debian-8.8.0-i386-DVD-1.iso</url>
++ <iso>
++ <volume-id>Debian 8.\d.\d i386 1</volume-id>
++ </iso>
++ <kernel>install.386/vmlinuz</kernel>
++ <initrd>install.386/initrd.gz</initrd>
++ </media>
++ <media arch="x86_64">
++ <url>http://cdimage.debian.org/mirror/cdimage/archive/8.8.0/amd64/iso-dvd/debian-8.8.0-amd64-DVD-1.iso</url>
++ <iso>
++ <volume-id>Debian 8.\d.\d amd64 1</volume-id>
++ </iso>
++ <kernel>install.amd/vmlinuz</kernel>
++ <initrd>install.amd/initrd.gz</initrd>
++ </media>
++
++ <installer>
++ <script id='http://debian.org/scripts/debian/jeos'/>
++ <script id='http://debian.org/scripts/debian/desktop'/>
++ </installer>
++ </os>
++
++ <os id="http://debian.org/debian/9";>
++ <short-id>debian9</short-id>
++ <short-id>debianstretch</short-id>
++ <_name>Debian Stretch</_name>
++ <version>9</version>
++ <_vendor>Debian Project</_vendor>
++ <family>linux</family>
++ <distro>debian</distro>
++ <upgrades id="http://debian.org/debian/8"/>
++ <derives-from id="http://debian.org/debian/8"/>
++
++ <resources arch="all">
++ <minimum>
++ <cpu>1000000000</cpu>
++ <n-cpus>1</n-cpus>
++ <ram>134217728</ram>
++ <storage>5368709120</storage>
++ </minimum>
++ <recommended>
++ <cpu>1000000000</cpu>
++ <ram>1073741824</ram>
++ <storage>21474836480</storage>
++ </recommended>
++ </resources>
++
++ <media arch="i686">
++ <url>http://cdimage.debian.org/mirror/cdimage/archive/9.0.0/i386/iso-cd/debian-9.0.0-i386-netinst.iso</url>
++ <iso>
++ <volume-id>Debian 9.\d.\d i386 (1|n)</volume-id>
++ </iso>
++ <kernel>install.386/vmlinuz</kernel>
++ <initrd>install.386/initrd.gz</initrd>
++ </media>
++ <media arch="x86_64">
++ <url>http://cdimage.debian.org/mirror/cdimage/archive/9.0.0/amd64/iso-cd/debian-9.0.0-amd64-netinst.iso</url>
++ <iso>
++ <volume-id>Debian 9.\d.\d amd64 (1|n)</volume-id>
++ </iso>
++ <kernel>install.amd/vmlinuz</kernel>
++ <initrd>install.amd/initrd.gz</initrd>
++ </media>
++
++ <installer>
++ <script id='http://debian.org/scripts/debian/jeos'/>
++ <script id='http://debian.org/scripts/debian/desktop'/>
++ </installer>
++ </os>
++
+ </libosinfo>
+diff --git a/test/isodata/debian/debian8/debian-8.7.1-amd64-CD-1.iso.txt b/test/isodata/debian/debian8/debian-8.7.1-amd64-CD-1.iso.txt
+new file mode 100644
+index 0000000..9f8f232
+--- /dev/null
++++ b/test/isodata/debian/debian8/debian-8.7.1-amd64-CD-1.iso.txt
+@@ -0,0 +1,29 @@
++CD-ROM is in ISO 9660 format
++System id:
++Volume id: Debian 8.7.1 amd64 1
++Volume set id:
++Publisher id:
++Data preparer id: XORRISO-1.3.6 2014.04.08.180000, LIBISOBURN-1.3.6, LIBISOFS-1.3.6, LIBBURN-1.3.6
++Application id:
++Copyright File id:
++Abstract File id:
++Bibliographic File id:
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 322560
++El Torito VD version 1 found, boot catalog is in sector 2142
++Joliet with UCS level 3 found
++Rock Ridge signatures version 1 found
++Eltorito validation header:
++ Hid 1
++ Arch 0 (x86)
++ ID ''
++ Key 55 AA
++ Eltorito defaultboot header:
++ Bootid 88 (bootable)
++ Boot media 0 (No Emulation Boot)
++ Load segment 0
++ Sys type 0
++ Nsect 4
++ Bootoff 85F 2143
+diff --git a/test/isodata/debian/debian9/debian-9.0-amd64-netinst.iso.txt b/test/isodata/debian/debian9/debian-9.0-amd64-netinst.iso.txt
+new file mode 100644
+index 0000000..ca0b62d
+--- /dev/null
++++ b/test/isodata/debian/debian9/debian-9.0-amd64-netinst.iso.txt
+@@ -0,0 +1,29 @@
++CD-ROM is in ISO 9660 format
++System id:
++Volume id: Debian 9.0.0 amd64 n
++Volume set id:
++Publisher id:
++Data preparer id: XORRISO-1.3.6 2014.04.08.180000, LIBISOBURN-1.3.6, LIBISOFS-1.3.6, LIBBURN-1.3.6
++Application id:
++Copyright File id:
++Abstract File id:
++Bibliographic File id:
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 148480
++El Torito VD version 1 found, boot catalog is in sector 939
++Joliet with UCS level 3 found
++Rock Ridge signatures version 1 found
++Eltorito validation header:
++ Hid 1
++ Arch 0 (x86)
++ ID ''
++ Key 55 AA
++ Eltorito defaultboot header:
++ Bootid 88 (bootable)
++ Boot media 0 (No Emulation Boot)
++ Load segment 0
++ Sys type 0
++ Nsect 4
++ Bootoff 47C 1148
+diff --git a/test/isodata/debian/debian9/debian-9.0-amd64.iso.txt b/test/isodata/debian/debian9/debian-9.0-amd64.iso.txt
+new file mode 100644
+index 0000000..779c3df
+--- /dev/null
++++ b/test/isodata/debian/debian9/debian-9.0-amd64.iso.txt
+@@ -0,0 +1,29 @@
++CD-ROM is in ISO 9660 format
++System id:
++Volume id: Debian 9.0.0 amd64 1
++Volume set id:
++Publisher id:
++Data preparer id: XORRISO-1.3.6 2014.04.08.180000, LIBISOBURN-1.3.6, LIBISOFS-1.3.6, LIBBURN-1.3.6
++Application id:
++Copyright File id:
++Abstract File id:
++Bibliographic File id:
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 1857768
++El Torito VD version 1 found, boot catalog is in sector 5307
++Joliet with UCS level 3 found
++Rock Ridge signatures version 1 found
++Eltorito validation header:
++ Hid 1
++ Arch 0 (x86)
++ ID ''
++ Key 55 AA
++ Eltorito defaultboot header:
++ Bootid 88 (bootable)
++ Boot media 0 (No Emulation Boot)
++ Load segment 0
++ Sys type 0
++ Nsect 4
++ Bootoff 158C 5516
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..41fb9f7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Add-Debian-Jessie-and-Stretch.patch
