Your message dated Wed, 17 May 2023 22:28:49 +0000
with message-id <e1pzpdz-005gn3...@respighi.debian.org>
and subject line unblock fai
has caused the Debian Bug report #1036229,
regarding unblock: fai/6.0.2
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
1036229: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1036229
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package fai
In a few configs and scripts the non-free-firmware section was added.
In the script mkdebmirror bullseye was replaced with bookworm.
The script 50-misc can now handle the non-free-firmware section, but
also handle older releases that do not have this section.
See changelog below.
[~]$ debdiff fai_6.0.1.dsc fai_6.0.2.dsc|diffstat
bin/fai-mirror | 4 ++--
conf/sources.list | 6 +++---
debian/changelog | 10 ++++++++++
debian/fai-doc.doc-base.package | 3 ---
debian/rules | 3 ---
doc/Makefile | 7 +------
examples/simple/scripts/LAST/50-misc | 8 ++++++--
utils/mkdebmirror | 6 +++---
8 files changed, 25 insertions(+), 22 deletions(-)
[ Reason ]
adding non-free-firmware is essential for the users, it's also important to
support
older Debian releases.
[ Impact ]
(What is the impact for the user if the unblock isn't granted?)
[ Tests ]
I've review the code change and done manual tests of the new code and config.
[ Risks ]
The changes are not that big and mostly affect files in the fai-doc
package. Adding the non-free-firmware section is trivial. Also
removing the generation of postscript documentation is trivial.
[ Checklist ]
[X] all changes are documented in the d/changelog
[X] I reviewed all changes and I approve them
[X] attach debdiff against the package in testing
unblock fai/6.0.2
diff -Nru fai-6.0.1/bin/fai-mirror fai-6.0.2/bin/fai-mirror
--- fai-6.0.1/bin/fai-mirror 2022-09-25 12:00:17.000000000 +0200
+++ fai-6.0.2/bin/fai-mirror 2023-05-07 16:29:11.000000000 +0200
@@ -365,7 +365,7 @@
cat > $mirrordir/conf/distributions <<EOF # generate config file for reprepro
Codename: cskoeln
Architectures: $arch
-Components: main non-free contrib
+Components: main non-free contrib non-free-firmware
DebIndices: Packages Release . .xz
Description: Package repository created by fai-mirror
Label: fai-project.org
@@ -380,7 +380,7 @@
Codename: $bponame
Architectures: $arch
-Components: main non-free contrib
+Components: main non-free contrib non-free-firmware
DebIndices: Packages Release . .xz
Description: Package repository created by fai-mirror
Label: fai-project.org
diff -Nru fai-6.0.1/conf/sources.list fai-6.0.2/conf/sources.list
--- fai-6.0.1/conf/sources.list 2022-12-06 14:46:28.000000000 +0100
+++ fai-6.0.2/conf/sources.list 2023-05-07 16:29:11.000000000 +0200
@@ -1,8 +1,8 @@
# These lines should work for many sites
-deb http://deb.debian.org/debian bookworm main contrib non-free
-deb http://deb.debian.org/debian-security bookworm-security main contrib
non-free
-#deb http://deb.debian.org/debian bookworm-backports main contrib non-free
+deb http://deb.debian.org/debian bookworm main contrib non-free
non-free-firmware
+deb http://deb.debian.org/debian-security bookworm-security main contrib
non-free non-free-firmware
+#deb http://deb.debian.org/debian bookworm-backports main contrib non-free
non-free-firmware
# repository that may contain newer fai packages for bookworm
deb http://fai-project.org/download bookworm koeln
diff -Nru fai-6.0.1/debian/changelog fai-6.0.2/debian/changelog
--- fai-6.0.1/debian/changelog 2023-03-08 19:38:00.000000000 +0100
+++ fai-6.0.2/debian/changelog 2023-05-07 17:25:35.000000000 +0200
@@ -1,3 +1,13 @@
+fai (6.0.2) unstable; urgency=high
+
+ [ Thomas Lange ]
+ * add support for non-free-firmware, Closes: #1035555
+ * mkdebmirror: bullseye -> bookworm, Closes: #1035608
+ * doc/Makefile, debian/rules,fai-doc.doc-base.package:
+ do not create ps files
+
+ -- Thomas Lange <la...@debian.org> Sun, 07 May 2023 17:25:35 +0200
+
fai (6.0.1) unstable; urgency=low
[ Joerg Behrmann ]
diff -Nru fai-6.0.1/debian/fai-doc.doc-base.package
fai-6.0.2/debian/fai-doc.doc-base.package
--- fai-6.0.1/debian/fai-doc.doc-base.package 2012-05-02 23:05:48.000000000
+0200
+++ fai-6.0.2/debian/fai-doc.doc-base.package 2023-05-07 16:56:59.000000000
+0200
@@ -5,9 +5,6 @@
Debian GNU/Linux.
Section: Debian
-Format: postscript
-Files: /usr/share/doc/fai-doc/fai-guide.ps.gz
-
Format: text
Files: /usr/share/doc/fai-doc/fai-guide.text.gz
diff -Nru fai-6.0.1/debian/rules fai-6.0.2/debian/rules
--- fai-6.0.1/debian/rules 2021-05-01 22:23:53.000000000 +0200
+++ fai-6.0.2/debian/rules 2023-05-07 16:56:59.000000000 +0200
@@ -15,9 +15,6 @@
override_dh_installdocs:
dh_installdocs -Nfai-server -Nfai-quickstart
sed -i 's/FAIVERSIONSTRING/$(VERSIONSTRING)/'
debian/fai-client/usr/share/doc/fai-client/README
- # Remove embedded temporary directory for reproducible builds
- sed -i -e 's,/tmp/tmp.*/fai-guide.ps,fai-guide.ps,g'
debian/fai-doc/usr/share/doc/fai-doc/fai-guide.ps
- sed -i -e 's,/tmp/tmp.*/fai-guide.dvi,fai-guide.dvi,g'
debian/fai-doc/usr/share/doc/fai-doc/fai-guide.ps
override_dh_installchangelogs:
dh_installchangelogs -Nfai-server -Nfai-quickstart
diff -Nru fai-6.0.1/doc/Makefile fai-6.0.2/doc/Makefile
--- fai-6.0.1/doc/Makefile 2022-10-06 19:06:21.000000000 +0200
+++ fai-6.0.2/doc/Makefile 2023-05-07 16:29:11.000000000 +0200
@@ -6,7 +6,7 @@
OPT = --dblatex-opts "-P latex.output.revhistory=0"
-free: text html ps pdf
+free: text html pdf
# echo "`grep -c FIXME $(DOC).txt` FIXMEs left to fix:"
# grep FIXME $(DOC).txt
@@ -21,11 +21,6 @@
a2x $(OPT) -L --icons -a toc -a toclevels=3 -f pdf $(DOC).txt
rm -f $(DOC).xml $(DOC).fo
-.NOTPARALLEL: ps
-ps: $(DOC).txt images
- a2x $(OPT) -L --icons -a toc -a toclevels=3 -f ps $(DOC).txt
- rm -f $(DOC).xml $(DOC).fo
-
# a2x uses lynx, maybe use w3m instead
# which texwidth for text output?
# asciidoc --doctype=article -a "toc" -a "toclevels=3" -f
/etc/asciidoc/text.conf -b html4 -o - "f-guide.txt" | lynx -dump -stdin
>"./f-guide.text"
diff -Nru fai-6.0.1/examples/simple/scripts/LAST/50-misc
fai-6.0.2/examples/simple/scripts/LAST/50-misc
--- fai-6.0.1/examples/simple/scripts/LAST/50-misc 2023-01-13
21:39:33.000000000 +0100
+++ fai-6.0.2/examples/simple/scripts/LAST/50-misc 2023-05-06
17:09:43.000000000 +0200
@@ -95,10 +95,14 @@
setrel
if [ -f $target/etc/apt/sources.list -a -n "$release" ]; then
grep -q 'file generated by fai-cd' $target/etc/apt/sources.list && cat
<<EOF > $target/etc/apt/sources.list
-deb $apt_cdn/debian $release main contrib non-free
-deb $security_cdn/debian-security ${secsuite} main contrib non-free
+deb $apt_cdn/debian $release main contrib non-free non-free-firmware
+deb $security_cdn/debian-security ${secsuite} main contrib non-free
non-free-firmware
#deb [trusted=yes] http://fai-project.org/download $release koeln
EOF
+ # older releases do not have the non-free-firmware section
+ if [[ "buster bullseye" =~ "$release" ]]; then
+ sed -i -e 's/non-free-firmware//g' $target/etc/apt/sources.list
+ fi
# if the package fai-server was installed, enable the project's repository
if dpkg-query --admindir=$target/var/lib/dpkg -W fai-server >/dev/null
2>&1; then
fai-sed '/fai-project.org/s/^#//' /etc/apt/sources.list
diff -Nru fai-6.0.1/utils/mkdebmirror fai-6.0.2/utils/mkdebmirror
--- fai-6.0.1/utils/mkdebmirror 2022-10-28 20:49:41.000000000 +0200
+++ fai-6.0.2/utils/mkdebmirror 2023-05-07 16:29:11.000000000 +0200
@@ -23,10 +23,10 @@
debug="$@"
arch=amd64
-dist=bullseye,bullseye-backports
+dist=bookworm,bookworm-backports
destdir=/files/scratch/debmirror
-sect="--section main,contrib,non-free"
+sect="--section main,contrib,non-free,non-free-firmware"
allopt="$debug --state-cache-days=100 --ignore-missing-release
--ignore-release-gpg --passive --nosource --arch=$arch"
# first sync from a mirror near to you
@@ -38,4 +38,4 @@
# even one should not mirror the security site, but I will do it.
echo "------------------ create mirror for debian-security ------------------"
-debmirror --keyring /usr/share/keyrings/debian-archive-keyring.gpg
--method=http $excl $destdir/debian-security $allopt --host=deb.debian.org -r
debian-security $sect -d bullseye-security $*
+debmirror --keyring /usr/share/keyrings/debian-archive-keyring.gpg
--method=http $excl $destdir/debian-security $allopt --host=deb.debian.org -r
debian-security $sect -d bookworm-security $*
--- End Message ---
--- Begin Message ---
Unblocked.
--- End Message ---
