Skip to content

Commit

Permalink
14220 Package manifests should be named .p5m and not .mf
Browse files Browse the repository at this point in the history
Reviewed by: Yuri Pankov <ypankov@tintri.com>
Reviewed by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
Approved by: Rich Lowe <richlowe@richlowe.net>
  • Loading branch information
citrus-it committed Nov 15, 2021
1 parent 86d4171 commit 25b05a3
Show file tree
Hide file tree
Showing 599 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion usr/src/data/ucode/update.intel
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ set -o pipefail

ucodetar="$1"

mf=../../pkg/manifests/system-microcode-intel.mf
mf=../../pkg/manifests/system-microcode-intel.p5m
[[ -f $mf ]] || {
echo "Run from usr/src/data/ucode" 2>&1
exit 1
Expand Down
2 changes: 1 addition & 1 deletion usr/src/data/zoneinfo/README.illumos
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ hardlink path=usr/share/lib/zoneinfo/Arda/Gondolin target=Beleriand
The 'update' make target can help with this by automatically re-generating all
of the hardlinks in the package manifest based on the Link lines found in the
data files. Run 'make update' and then check the manifest file at
$CODEMGR_WS/usr/src/pkg/manifests/system-data-zoneinfo.mf to ensure it has
$CODEMGR_WS/usr/src/pkg/manifests/system-data-zoneinfo.p5m to ensure it has
done the right thing.

Other differences in files describe the addition and removal of various
Expand Down
2 changes: 1 addition & 1 deletion usr/src/data/zoneinfo/update_manifest
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ This script should be run within a bldenv by issuing 'make update' in
exit 1
fi

MANIFEST=$CODEMGR_WS/usr/src/pkg/manifests/system-data-zoneinfo.mf
MANIFEST=$CODEMGR_WS/usr/src/pkg/manifests/system-data-zoneinfo.p5m
PREFIX=usr/share/lib/zoneinfo

if [[ ! -f "$MANIFEST" ]]; then
Expand Down
28 changes: 14 additions & 14 deletions usr/src/pkg/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -249,21 +249,21 @@ CLOBBERFILES= $(PDIR) proto_list_$(PKGMACH) install-$(PKGMACH).out \
# SUNW.* as one useful example.
#
SPECIAL_MANIFESTS = system-library-python-.*
LIST_MANIFESTS_CMD = (cd manifests ; /usr/bin/ls -1 *.mf |\
LIST_MANIFESTS_CMD = (cd manifests ; /usr/bin/ls -1 *.p5m |\
$(SED) $(SPECIAL_MANIFESTS:%=-e '/^%$$/d') )
MANIFESTS = $(LIST_MANIFESTS_CMD:sh)

# Conditionally add back python modules
$(BUILDPY2) MANIFESTS += \
system-library-python-libbe-2.mf \
system-library-python-solaris-2.mf \
system-library-python-zfs-2.mf
system-library-python-libbe-2.p5m \
system-library-python-solaris-2.p5m \
system-library-python-zfs-2.p5m
$(BUILDPY3) MANIFESTS += \
system-library-python-libbe-3.mf \
system-library-python-solaris-3.mf \
system-library-python-zfs-3.mf
system-library-python-libbe-3.p5m \
system-library-python-solaris-3.p5m \
system-library-python-zfs-3.p5m

PKGS= $(MANIFESTS:%.mf=%)
PKGS= $(MANIFESTS:%.p5m=%)
DEP_PKGS= $(PKGS:%=$(PDIR)/%.dep)
PROC_PKGS= $(PKGS:%=$(PDIR)/%.mog)
FIN_PKGS= $(PKGS:%=$(PDIR)/%.fin)
Expand Down Expand Up @@ -326,7 +326,7 @@ PKGLISTS= \
#
# For a single manifest, the dependency chain looks like this:
#
# raw manifest (mypkg.mf)
# raw manifest (mypkg.p5m)
# |
# | use pkgmogrify to process raw manifest
# |
Expand Down Expand Up @@ -532,9 +532,9 @@ $(REPOS:%=$(PKGDEST)/repo.%):
# pkgmogrify encounters an abort in the publish transforms.
#

.SUFFIXES: .mf .mog .dep .res .fin .pub
.SUFFIXES: .p5m .mog .dep .res .fin .pub

$(PDIR)/%.mog: manifests/%.mf
$(PDIR)/%.mog: manifests/%.p5m
@print "Processing manifest $(<F)"
@pkgfmt -fv2 -c $<
$(PKGDEBUG)$(RM) $(@) $(@:%.mog=%) $(@:%.mog=%.nodepend) \
Expand Down Expand Up @@ -611,12 +611,12 @@ $(PDIR)/%.pub: $(PDIR)/%.fin
# The implementation notes from the previous rule are applicable
# here, too.
#
$(PROC_SYNTH_PKGS): $(PKGLISTS) $$(@F:%.mog=%.mf)
@print "Processing synthetic manifest $(@F:%.mog=%.mf)"
$(PROC_SYNTH_PKGS): $(PKGLISTS) $$(@F:%.mog=%.p5m)
@print "Processing synthetic manifest $(@F:%.mog=%.p5m)"
$(PKGDEBUG)$(RM) $(@) $(PDIR)/$(@F:%.mog=%).metadata.* $(@).vars
$(PKGDEBUG)$(PKGMOGRIFY) $(PKGMOG_VERBOSE) -I transforms -I $(PDIR) \
$(PKGMOG_DEFINES:%=-D %) -D PKGDEP_TYPE=$(PKGDEP_TYPE) \
-P $(@).vars -O $(@) $(@F:%.mog=%.mf) \
-P $(@).vars -O $(@) $(@F:%.mog=%.p5m) \
$(PM_TRANSFORMS) synthetic
$(PKGDEBUG)eval REPO=redist PKGSTAT=current `$(CAT) -s $(@).vars`; \
if [ -f $(@) ]; then \
Expand Down
14 changes: 7 additions & 7 deletions usr/src/pkg/README.pkg
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ Incremental Builds
make command line and specify the "all" target. If you want to process
them all, simply specify the "all" target.

% dmake -e PKGS="BRCMbnx BRCMbnxe" all
% dmake -e PKGS="BRCMbnx BRCMbnxe" all
% dmake -e all

If you want to publish a subset of packages, simply set PKGS on the
Expand All @@ -124,7 +124,7 @@ Incremental Builds
system. If you want to publish them all, simply specify the
"install" target.

% dmake -e PKGS="BRCMbnx BRCMbnxe" install
% dmake -e PKGS="BRCMbnx BRCMbnxe" install
% dmake -e install

You can also use package names, or package names with ".pub"
Expand Down Expand Up @@ -365,13 +365,13 @@ For example, to find rename ancestors of 'system/zones', do the following:

$ cd usr/src/pkg/manifests
$ mypkgname=system/zones
$ grep -l "fmri=pkg:/$mypkgname@" `grep -l pkg.renamed *.mf` /dev/null
SUNWzone.mf
$ grep -l "fmri=pkg:/$mypkgname@" `grep -l pkg.renamed *.p5m` /dev/null
SUNWzone.p5m

Make sure to check that the package has not undergone multiple renames!

$ mypkgname=SUNWzone
$ grep -l "fmri=pkg:/$mypkgname@" `grep -l pkg.renamed *.mf` /dev/null
$ grep -l "fmri=pkg:/$mypkgname@" `grep -l pkg.renamed *.p5m` /dev/null
$

Once you have the renamed ancestor list, for *each* of the packages (the
Expand Down Expand Up @@ -402,13 +402,13 @@ to system/foobar in build 140, and then later obsoleted in build 150.
Note that in all cases the package FMRI is updated to the obsoletion
build, 150.

SUNWfoobar.mf:
SUNWfoobar.p5m:
# Was renamed to system/foobar, both now obsolete.
set name=pkg.fmri value=pkg:/SUNWfoobar@0.5.11,5.11-0.150
set name=pkg.obsolete value=true
set name=variant.arch value=$(ARCH)

system-foobar.mf:
system-foobar.p5m:
set name=pkg.fmri value=pkg:/system/foobar@0.5.11,5.11-0.150
set name=pkg.obsolete value=true
set name=variant.arch value=$(ARCH)
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 25b05a3

Please sign in to comment.