Bug #6349
openexample configs missing in release tarballs
0%
Description
Today I created a release osmo-bts v1.7.2
package for Arch Linux:
https://aur.archlinux.org/packages/osmo-bts
https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=osmo-bts
which downloads, unpacks, and builds the latest release tarball:
https://downloads.osmocom.org/releases/osmo-bts/osmo-bts-1.7.2.tar.bz2
Unfortunately, I am hitting a build error when running makepkg
:
Making all in doc make[2]: Entering directory '/home/fixeria/projects/archlinux/osmo-bts/src/osmo-bts-1.7.2/doc' Making all in examples make[3]: Entering directory '/home/fixeria/projects/archlinux/osmo-bts/src/osmo-bts-1.7.2/doc/examples' make[3]: *** No rule to make target 'trx/osmo-bts-trx.cfg', needed by 'all-am'. Stop. make[3]: Leaving directory '/home/fixeria/projects/archlinux/osmo-bts/src/osmo-bts-1.7.2/doc/examples' make[2]: *** [Makefile:387: all-recursive] Error 1 make[2]: Leaving directory '/home/fixeria/projects/archlinux/osmo-bts/src/osmo-bts-1.7.2/doc' make[1]: *** [Makefile:446: all-recursive] Error 1 make[1]: Leaving directory '/home/fixeria/projects/archlinux/osmo-bts/src/osmo-bts-1.7.2' make: *** [Makefile:378: all] Error 2 ==> ERROR: A failure occurred in build(). Aborting...
The problem can be reproduced by downloading and building the tarball manually (make sure to build with --enable-trx
).
Surprisingly, trx/osmo-bts-trx.cfg
is not present in the release tarball:
$ tar -tvf osmo-bts-1.7.2.tar.bz2 | grep doc/examples drwxr-xr-x 1000/1000 0 2023-12-15 12:19 osmo-bts-1.7.2/doc/examples/ -rw-r--r-- 1000/1000 23617 2023-12-15 12:19 osmo-bts-1.7.2/doc/examples/Makefile.in drwxr-xr-x 1000/1000 0 2023-12-15 12:19 osmo-bts-1.7.2/doc/examples/virtual/ -rw-r--r-- 1000/1000 1271 2023-12-15 12:19 osmo-bts-1.7.2/doc/examples/virtual/osmo-bts-virtual.cfg -rw-r--r-- 1000/1000 1501 2023-12-15 12:19 osmo-bts-1.7.2/doc/examples/Makefile.am
I believe the problem is that in doc/examples/Makefile.am
we add config files to EXTRA_DIST
conditionally:
if ENABLE_TRX
doc_trxdir = $(docdir)/examples/osmo-bts-trx
doc_trx_DATA = \
trx/osmo-bts-trx.cfg \
trx/osmo-bts-trx-calypso.cfg
EXTRA_DIST += $(doc_trx_DATA)
OSMOCONF_FILES += trx/osmo-bts-trx.cfg
endif
So if the project is configured without --enable-foo
, then make dist-bzip2
will produce a tarball without those files added conditionally.
Updated by fixeria 3 months ago
- Project changed from OsmoBTS to Cellular Network Infrastructure
The osmo-trx package is also affected by this problem:
https://aur.archlinux.org/packages/osmo-trx
https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=osmo-trx
Making all in doc make[2]: Entering directory '/home/fixeria/projects/archlinux/osmo-trx/src/osmo-trx-1.6.1/doc' Making all in examples make[3]: Entering directory '/home/fixeria/projects/archlinux/osmo-trx/src/osmo-trx-1.6.1/doc/examples' make[3]: *** No rule to make target 'osmo-trx-uhd/osmo-trx-uhd.cfg', needed by 'all-am'. Stop. make[3]: Leaving directory '/home/fixeria/projects/archlinux/osmo-trx/src/osmo-trx-1.6.1/doc/examples' make[2]: *** [Makefile:403: all-recursive] Error 1 make[2]: Leaving directory '/home/fixeria/projects/archlinux/osmo-trx/src/osmo-trx-1.6.1/doc' make[1]: *** [Makefile:520: all-recursive] Error 1 make[1]: Leaving directory '/home/fixeria/projects/archlinux/osmo-trx/src/osmo-trx-1.6.1' make: *** [Makefile:451: all] Error 2 ==> ERROR: A failure occurred in build(). Aborting...
$ tar -xvf osmo-trx-1.6.1.tar.bz2 | grep doc/examples osmo-trx-1.6.1/doc/examples/ osmo-trx-1.6.1/doc/examples/osmo-trx-ipc/ osmo-trx-1.6.1/doc/examples/osmo-trx-ipc/osmo-trx-ipc.cfg osmo-trx-1.6.1/doc/examples/osmo-trx-lms/ osmo-trx-1.6.1/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg osmo-trx-1.6.1/doc/examples/Makefile.in osmo-trx-1.6.1/doc/examples/osmo-trx-uhd/ osmo-trx-1.6.1/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg osmo-trx-1.6.1/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg osmo-trx-1.6.1/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg osmo-trx-1.6.1/doc/examples/Makefile.am
Updated by fixeria 3 months ago
- Checklist item osmo-bts added
- Checklist item osmo-trx added
Here is a fix for osmo-bts:
https://gerrit.osmocom.org/c/osmo-bts/+/35726 doc/examples: fix missing config files in release tarballs
$ tar -tvf osmo-bts-1.7.0.54-82a2.tar.bz2 | grep doc/examples drwxr-xr-x 1000/1001 0 2024-01-28 23:30 osmo-bts-1.7.0.54-82a2/doc/examples/ drwxr-xr-x 1000/1001 0 2024-01-28 23:30 osmo-bts-1.7.0.54-82a2/doc/examples/trx/ -rw-r--r-- 1000/1001 693 2024-01-28 06:49 osmo-bts-1.7.0.54-82a2/doc/examples/trx/osmo-bts-trx.cfg -rw-r--r-- 1000/1001 841 2024-01-28 06:49 osmo-bts-1.7.0.54-82a2/doc/examples/trx/osmo-bts-trx-calypso.cfg drwxr-xr-x 1000/1001 0 2024-01-28 23:30 osmo-bts-1.7.0.54-82a2/doc/examples/octphy/ -rw-r--r-- 1000/1001 685 2024-01-28 06:49 osmo-bts-1.7.0.54-82a2/doc/examples/octphy/osmo-bts-trx2dsp1.cfg -rw-r--r-- 1000/1001 652 2024-01-28 06:49 osmo-bts-1.7.0.54-82a2/doc/examples/octphy/osmo-bts-octphy.cfg drwxr-xr-x 1000/1001 0 2024-01-28 23:30 osmo-bts-1.7.0.54-82a2/doc/examples/oc2g/ -rw-r--r-- 1000/1001 897 2024-01-28 06:49 osmo-bts-1.7.0.54-82a2/doc/examples/oc2g/osmo-bts-oc2g.cfg -rw-r--r-- 1000/1001 796 2024-01-28 06:49 osmo-bts-1.7.0.54-82a2/doc/examples/oc2g/oc2gbts-mgr.cfg drwxr-xr-x 1000/1001 0 2024-01-28 23:30 osmo-bts-1.7.0.54-82a2/doc/examples/sysmo/ -rw-r--r-- 1000/1001 527 2024-01-28 06:49 osmo-bts-1.7.0.54-82a2/doc/examples/sysmo/sysmobts-mgr.cfg -rw-r--r-- 1000/1001 587 2024-01-28 06:49 osmo-bts-1.7.0.54-82a2/doc/examples/sysmo/osmo-bts-sysmo.cfg -rw-r--r-- 1000/1001 23703 2024-01-28 23:30 osmo-bts-1.7.0.54-82a2/doc/examples/Makefile.in drwxr-xr-x 1000/1001 0 2024-01-28 23:30 osmo-bts-1.7.0.54-82a2/doc/examples/litecell15/ -rw-r--r-- 1000/1001 969 2024-01-28 06:49 osmo-bts-1.7.0.54-82a2/doc/examples/litecell15/osmo-bts-lc15.cfg -rw-r--r-- 1000/1001 1007 2024-01-28 06:49 osmo-bts-1.7.0.54-82a2/doc/examples/litecell15/lc15bts-mgr.cfg drwxr-xr-x 1000/1001 0 2024-01-28 23:30 osmo-bts-1.7.0.54-82a2/doc/examples/virtual/ -rw-r--r-- 1000/1001 1336 2024-01-28 06:49 osmo-bts-1.7.0.54-82a2/doc/examples/virtual/osmo-bts-virtual.cfg -rw-r--r-- 1000/1001 1776 2024-01-28 23:12 osmo-bts-1.7.0.54-82a2/doc/examples/Makefile.am
Updated by fixeria 3 months ago
I also documented this problem in the wiki:
https://osmocom.org/projects/cellular-infrastructure/wiki/BuildSystem#EXTRA_DIST
Updated by fixeria 3 months ago
- Checklist item osmo-bts set to Done
- Checklist item osmo-trx set to Done
Here is a fix for osmo-trx:
https://gerrit.osmocom.org/c/osmo-trx/+/35727 doc/examples: fix missing config files in release tarballs [NEW]
$ tar -tvf osmo-trx-1.6.0.10-a2d76.tar.bz2 | grep doc/examples drwxr-xr-x 1000/1001 0 2024-01-29 00:00 osmo-trx-1.6.0.10-a2d76/doc/examples/ drwxr-xr-x 1000/1001 0 2024-01-29 00:00 osmo-trx-1.6.0.10-a2d76/doc/examples/osmo-trx-uhd/ -rw-r--r-- 1000/1001 379 2024-01-29 00:00 osmo-trx-1.6.0.10-a2d76/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg -rw-r--r-- 1000/1001 368 2024-01-29 00:00 osmo-trx-1.6.0.10-a2d76/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg -rw-r--r-- 1000/1001 368 2024-01-28 23:46 osmo-trx-1.6.0.10-a2d76/doc/examples/osmo-trx-uhd/osmo-trx-uhd.cfg -rw-r--r-- 1000/1001 465 2024-01-29 00:00 osmo-trx-1.6.0.10-a2d76/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg drwxr-xr-x 1000/1001 0 2024-01-29 00:00 osmo-trx-1.6.0.10-a2d76/doc/examples/osmo-trx-lms/ -rw-r--r-- 1000/1001 379 2024-01-29 00:00 osmo-trx-1.6.0.10-a2d76/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg -rw-r--r-- 1000/1001 379 2024-01-28 23:46 osmo-trx-1.6.0.10-a2d76/doc/examples/osmo-trx-lms/osmo-trx-lms.cfg -rw-r--r-- 1000/1001 17530 2024-01-28 23:59 osmo-trx-1.6.0.10-a2d76/doc/examples/Makefile.in -rw-r--r-- 1000/1001 1343 2024-01-28 23:46 osmo-trx-1.6.0.10-a2d76/doc/examples/Makefile.am drwxr-xr-x 1000/1001 0 2024-01-29 00:00 osmo-trx-1.6.0.10-a2d76/doc/examples/osmo-trx-ipc/ -rw-r--r-- 1000/1001 656 2024-01-29 00:00 osmo-trx-1.6.0.10-a2d76/doc/examples/osmo-trx-ipc/osmo-trx-ipc.cfg
Updated by fixeria 3 months ago
- Status changed from In Progress to Feedback
All patches have been merged. I guess we want to tag patch releases for osmo-bts and osmo-trx, so that we have complete and usable tarballs earlier than we tag stable releases next time?
I would not bother cherry-picking recent bug fixes and only focus on those patches fixing EXTRA_DIST
stuff.
Updated by fixeria 3 months ago
fixeria wrote in #note-5:
All patches have been merged. I guess we want to tag patch releases for osmo-bts and osmo-trx, so that we have complete and usable tarballs earlier than we tag stable releases next time?
I managed to workaround the missing files in PKGBUILDs:
https://aur.archlinux.org/cgit/aur.git/commit/PKGBUILD?h=osmo-bts&id=9911b46f2f4997d3b64b405d841350ca1ea59cb1
https://aur.archlinux.org/cgit/aur.git/commit/PKGBUILD?h=osmo-trx&id=a865ae34954e56e6d70a99de6b41e0ff613edca8
so tagging patch releases is not urgent to me at all.