Bug 233359 - make packages doesn't handle PRERELEASE, ALPHA and BETA branches
Summary: make packages doesn't handle PRERELEASE, ALPHA and BETA branches
Status: New
Alias: None
Product: Base System
Classification: Unclassified
Component: bin (show other bugs)
Version: CURRENT
Hardware: Any Any
: --- Affects Only Me
Assignee: freebsd-bugs mailing list
URL:
Keywords: patch
Depends on:
Blocks:
 
Reported: 2018-11-20 21:23 UTC by Sylvain Garrigues
Modified: 2018-11-27 07:03 UTC (History)
2 users (show)

See Also:


Attachments
make packages output (31.58 KB, text/plain)
2018-11-20 21:23 UTC, Sylvain Garrigues
no flags Details
Suggested fix (519 bytes, patch)
2018-11-25 22:17 UTC, Sylvain Garrigues
no flags Details | Diff
Suggested fix (520 bytes, patch)
2018-11-25 22:20 UTC, Sylvain Garrigues
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Sylvain Garrigues 2018-11-20 21:23:09 UTC
Created attachment 199390 [details]
make packages output

On -CURRENT, running `make packages' used to print things like:
===> Creating FreeBSD-runtime-12.0.sSomeTimeStamp

Now I switched to stable/12 and I don't see any version or timestamp in package names:
===> Creating FreeBSD-runtime-12.0
Plus a lot of "pkg: duplicate directory listing: ..., ignoring"

Please see attached log.

As a consequence, I cannot update my remote systems as `pkg upgrade` don't feel the need to upgrade packages with the same version. However, it sees the new packages.

[root@home ~]# pkg upgrade
Updating FreeBSD repository catalogue...
FreeBSD repository is up to date.
Updating FreeBSD-base repository catalogue...
Fetching meta.txz: 100%    260 B   0.3kB/s    00:01
Fetching packagesite.txz: 100%   16 KiB  16.4kB/s    00:01
Processing entries: 100%
FreeBSD-base repository update completed. 214 packages processed.
All repositories are up to date.
Checking for upgrades (3 candidates): 100%
Processing candidates (3 candidates): 100%
Checking integrity... done (0 conflicting)
Your packages are up to date.
[root@home ~]#
Comment 1 Sylvain Garrigues 2018-11-20 21:32:37 UTC
make -C release MK_AUTO_OBJ=no -V BRANCH gives me 
"PRERELEASE"

The EXTRA_VERSION timestamp suffix is appended to package names when we are on a BRANCH which iS STABLE or CURRENT or ALPHA. 

There is the bug :)
Comment 2 Sylvain Garrigues 2018-11-25 22:17:20 UTC
Created attachment 199556 [details]
Suggested fix

Attached patch fixes Makefile.inc1
Comment 3 Sylvain Garrigues 2018-11-25 22:20:10 UTC
Created attachment 199557 [details]
Suggested fix