osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/41117?usp=email )
Change subject: OBS: disable_manuals: adjust for osmocom-bb
......................................................................
OBS: disable_manuals: adjust for osmocom-bb
With the related change, we build manauals in the debian package of
osmocom-bb. The osmocom:nightly:asan feed gets built with manuals
disabled. Fix that building the osmocom-bb package in the asan feed
currently fails with:
[ 160s] /usr/bin/make -C doc/manuals
[ 160s] make[2]: Entering directory '/usr/src/packages/BUILD/doc/manuals'
[ 160s] OSMO_GSM_MANUALS_DIR: /usr/src/packages/osmo-gsm-manuals (fallback)
[ 160s] ERROR: OSMO_GSM_MANUALS_DIR does not exist!
[ 160s] Install osmo-gsm-manuals or set OSMO_GSM_MANUALS_DIR.
[ 160s] Makefile:6: /build/Makefile.asciidoc.inc: No such file or directory
[ 160s] make[2]: *** No rule to make target '/build/Makefile.asciidoc.inc'.
Stop.
Related: osmocom-bb Ib04160287c98814a6f2ae104197abda563bdd5b9
Change-Id: I88f3291acbf067ab8779b298e828e18eb828a511
---
M scripts/obs/lib/debian.py
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/scripts/obs/lib/debian.py b/scripts/obs/lib/debian.py
index 0438dd8..b67551f 100644
--- a/scripts/obs/lib/debian.py
+++ b/scripts/obs/lib/debian.py
@@ -177,9 +177,10 @@
lib.run_cmd(["sed", "-i", "/doxygen/d", f"{debian}/control"])
# Remove debian/*-doc.install
lib.run_cmd(f"rm -rf {shlex.quote(debian)}/*-doc.install", shell=True)
- # debian/rules: remove --enable-manuals/doxygen, add --disable-doxygen
+ # debian/rules: remove --enable-manuals etc.
lib.run_cmd(["sed", "-i", "s/--enable-manuals//g", f"{debian}/rules"])
lib.run_cmd(["sed", "-i", "s/--enable-doxygen//g", f"{debian}/rules"])
+ lib.run_cmd(["sed", "-i", "s/$(MAKE) -C doc\/manuals//g",
f"{debian}/rules"])
def build_source_package(project):
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41117?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I88f3291acbf067ab8779b298e828e18eb828a511
Gerrit-Change-Number: 41117
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osm...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: osmith <osm...@sysmocom.de>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
