[Pkg-electronics-devel] Bug#1033789: unblock: verilator/5.006-3
Carsten Schoenert
c.schoenert at t-online.de
Sat Apr 1 10:16:30 BST 2023
Package: release.debian.org
Severity: normal
User: release.debian.org at packages.debian.org
Usertags: unblock
X-Debbugs-Cc: verilator at packages.debian.org
Control: affects -1 + src:verilator
Please unblock package verilator
[ Reason ]
Dimitry Shachnev reported a RC issue (#1033667) against the verilator
package which is fixed by version 5.006-3.
[ Impact ]
Without that fix users are unable to install the verilator package in
bookworm.
[ Tests ]
The verialtor package has currently no autopkgtest so only manual
testing was happen.
[ Risks ]
There are no typical risks, verilator has no reverse dependencies by
or in other packages.
[ 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
As no modification did happen in the upstream related code parts I add
the debian/ related changes directly inline.
diff --git a/debian/changelog b/debian/changelog
index 4c4d83e7..48675e51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+verilator (5.006-3) unstable; urgency=medium
+
+ * Team upload
+ [ Dmitry Shachnev ]
+ * [38e486b] Move ${sphinxdoc:Built-Using} to the correct field.
+ (Closes: #1033667)
+
+ [ Carsten Schoenert ]
+ * [975c120] d/gbp.conf: Adjust to debian/bookworm
+ * [e05438c] Rebuild patch queue from patch-queue branch
+ Added patches:
+ Fix-build-on-hppa.patch
+ Fix-date-on-the-front-page-of-verilator.pdf-3956-3957.patch
+ (Closes: #1030913, #1031711)
+
+ -- Carsten Schoenert <c.schoenert at t-online.de> Thu, 30 Mar 2023 20:05:11 +0200
+
verilator (5.006-2) unstable; urgency=medium
* Team upload
diff --git a/debian/control b/debian/control
index d02cf292..add11de7 100644
--- a/debian/control
+++ b/debian/control
@@ -31,8 +31,9 @@ Depends:
${misc:Depends},
${perl:Depends},
${shlibs:Depends},
- ${sphinxdoc:Built-Using},
${sphinxdoc:Depends},
+Built-Using:
+ ${sphinxdoc:Built-Using},
Recommends:
libsystemc-dev,
Suggests:
diff --git a/debian/gbp.conf b/debian/gbp.conf
index f892216e..f59e67e2 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -3,7 +3,7 @@
pristine-tar = True
# generate gz compressed orig.tar file
compression = gz
-debian-branch = debian/sid
+debian-branch = debian/bookworm
upstream-branch = upstream
[pq]
diff --git a/debian/patches/Fix-build-on-hppa.patch b/debian/patches/Fix-build-on-hppa.patch
new file mode 100644
index 00000000..d0a82040
--- /dev/null
+++ b/debian/patches/Fix-build-on-hppa.patch
@@ -0,0 +1,24 @@
+From: Larry Doolittle <ldoolitt at recycle.lbl.gov>
+Date: Fri, 10 Feb 2023 21:31:44 -0800
+Subject: Fix build on hppa
+
+As supplied by John David Anglin in Debian bug #1030913
+
+Forwarded: https://github.com/verilator/verilator/pull/3954
+---
+ include/verilatedos.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/verilatedos.h b/include/verilatedos.h
+index 0e30164..7efd61e 100644
+--- a/include/verilatedos.h
++++ b/include/verilatedos.h
+@@ -519,6 +519,8 @@ using ssize_t = uint32_t; ///< signed size_t; returned from read()
+ # define VL_CPU_RELAX() asm volatile("nop" ::: "memory");
+ #elif defined(__aarch64__) || defined(__arm__)
+ # define VL_CPU_RELAX() asm volatile("yield" ::: "memory")
++#elif defined(__hppa__) // HPPA does not currently have yield/pause
++# define VL_CPU_RELAX() asm volatile("nop" ::: "memory")
+ #elif defined(__loongarch__) // LoongArch does not currently have yield/pause
+ # define VL_CPU_RELAX() asm volatile("nop" ::: "memory")
+ #elif defined(__mips64el__) || defined(__mips__) || defined(__mips64__) || defined(__mips64)
diff --git a/debian/patches/Fix-date-on-the-front-page-of-verilator.pdf-3956-3957.patch b/debian/patches/Fix-date-on-the-front-page-of-verilator.pdf-3956-3957.patch
new file mode 100644
index 00000000..d4d559a2
--- /dev/null
+++ b/debian/patches/Fix-date-on-the-front-page-of-verilator.pdf-3956-3957.patch
@@ -0,0 +1,69 @@
+From: Larry Doolittle <ldoolitt at recycle.lbl.gov>
+Date: Sun, 12 Feb 2023 20:21:03 -0800
+Subject: Fix date on the front page of verilator.pdf (#3956) (#3957)
+
+Forwarded: https://github.com/verilator/verilator/issues/3956
+---
+ docs/guide/conf.py | 27 ++++++++++++---------------
+ 1 file changed, 12 insertions(+), 15 deletions(-)
+
+diff --git a/docs/guide/conf.py b/docs/guide/conf.py
+index 04759c6..9f69245 100644
+--- a/docs/guide/conf.py
++++ b/docs/guide/conf.py
+@@ -10,7 +10,6 @@
+ # ----------------------------------------------------------------------
+ # -- Path setup
+
+-from datetime import datetime
+ import os
+ import re
+ import sys
+@@ -24,10 +23,17 @@ def get_vlt_version():
+ filename = "../../Makefile"
+ with open(filename, "r", encoding="utf8") as fh:
+ for line in fh:
+- match = re.search(r"PACKAGE_VERSION_NUMBER *= *([a-z0-9.]+)", line)
++ match = re.search(r"PACKAGE_VERSION *= *([a-z0-9.]+) +([-0-9]+)", line)
+ if match:
+- return match.group(1)
+- return "unknown"
++ return match.group(1), match.group(2)
++ match = re.search(r"PACKAGE_VERSION *= *([a-z0-9.]+) +devel", line)
++ if match:
++ try:
++ data = os.popen('git log -n 1 --pretty=%cs').read()
++ except Exception:
++ data = "" # fallback, and Sphinx will fill in today's date
++ return "Devel " + match.group(1), data
++ return "unknown", "unknown"
+
+
+ def setup(app):
+@@ -44,8 +50,8 @@ author = 'Wilson Snyder'
+ # The master toctree document.
+ master_doc = "index"
+
+-version = get_vlt_version()
+-release = get_vlt_version()
++version, today_fmt = get_vlt_version()
++release = version
+
+ rst_prolog = """
+ .. role:: vlopt(option)
+@@ -89,15 +95,6 @@ source_suffix = [".rst"]
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']
+
+-try:
+- # https://reproducible-builds.org/specs/source-date-epoch/
+- doc_now = datetime.fromtimestamp(int(os.environ["SOURCE_DATE_EPOCH"]))
+- print("Using SOURCE_DATE_EPOCH")
+-except Exception:
+- doc_now = datetime.now()
+-# Date format to ISO
+-today_fmt = doc_now.strftime("%F")
+-
+ # If true, `todo` and `todoList` produce output, else they produce nothing.
+ todo_include_todos = True
+
diff --git a/debian/patches/series b/debian/patches/series
index 3f6c74aa..5c9bd6eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
pkgconfig.diff
Add-SOURCE_DATE_EPOCH-for-docs-guide-conf.py-3918.patch
+Fix-date-on-the-front-page-of-verilator.pdf-3956-3957.patch
+Fix-build-on-hppa.patch
[ Other info ]
While preparing version 5.006-3 two more bug reports get incorporated
and fixed, one fixes the build on hppa, the other is releated to the
reproducibility of the verilator package.
unblock verilator/5.006-3
More information about the Pkg-electronics-devel
mailing list