Bug 233359

Summary: make packages doesn't handle PRERELEASE, ALPHA and BETA branches
Product: Base System Reporter: Sylvain Garrigues <sylvain>
Component: binAssignee: freebsd-bugs (Nobody) <bugs>
Status: New ---    
Severity: Affects Only Me CC: bapt, gjb
Priority: --- Keywords: patch
Version: CURRENT   
Hardware: Any   
OS: Any   
Description Flags
make packages output
Suggested fix
Suggested fix none

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 

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