Make illumos-closed usable for illumos-gate build

Marcel Telka

2022-01-17 856730f933ba68b06b1075a6dfc36110eceb3ea3

Make illumos-closed usable for illumos-gate build

 components/openindiana/illumos-closed/Makefile

@@ -16,7 +16,7 @@

COMPONENT_NAME=        illumos-closed
COMPONENT_VERSION=    5.11
COMPONENT_REVISION=    1
COMPONENT_REVISION=    2
COMPONENT_SUMMARY=    illumos-closed - illumos closed binaries
COMPONENT_PROJECT_URL=    https://www.openindiana.org/
COMPONENT_FMRI=        developer/illumos-closed
@@ -46,6 +46,19 @@

CLEAN_PATHS += $(BUILD_DIR)

PKG_HARDLINKS +=    opt/onbld/closed/root_i386/etc/init.d/llc2
PKG_HARDLINKS +=    opt/onbld/closed/root_i386/kernel/strmod/$(MACH64)/sdpib
PKG_HARDLINKS +=    opt/onbld/closed/root_i386/kernel/strmod/sdpib
PKG_HARDLINKS +=    opt/onbld/closed/root_i386/platform/i86pc/kernel/cpu/cpu_ms.GenuineIntel.6.46
PKG_HARDLINKS +=    opt/onbld/closed/root_i386/platform/i86pc/kernel/cpu/$(MACH64)/cpu_ms.GenuineIntel.6.46
PKG_HARDLINKS +=    opt/onbld/closed/root_i386/usr/xpg4/bin/alias
PKG_HARDLINKS +=    opt/onbld/closed/root_i386-nd/etc/init.d/llc2
PKG_HARDLINKS +=    opt/onbld/closed/root_i386-nd/kernel/drv/$(MACH64)/sdpib
PKG_HARDLINKS +=    opt/onbld/closed/root_i386-nd/kernel/drv/sdpib
PKG_HARDLINKS +=    opt/onbld/closed/root_i386-nd/platform/i86pc/kernel/cpu/cpu_ms.GenuineIntel.6.46
PKG_HARDLINKS +=    opt/onbld/closed/root_i386-nd/platform/i86pc/kernel/cpu/$(MACH64)/cpu_ms.GenuineIntel.6.46
PKG_HARDLINKS +=    opt/onbld/closed/root_i386-nd/usr/xpg4/bin/alias

$(BUILD_32):
    $(MKDIR) $(BUILD_DIR_32)
    $(TOUCH) $@

 components/openindiana/illumos-closed/illumos-closed.p5m

Diff too large

 components/openindiana/illumos-closed/manifests/sample-manifest.p5m

Diff too large

 components/openindiana/illumos-closed/pkg5

@@ -1,6 +1,7 @@
{
    "dependencies": [
        "SUNWcs",
        "shell/ksh93",
        "system/library"
    ],
    "fmris": [

 make-rules/ips.mk

@@ -302,7 +302,7 @@
    [ ! -d $(SAMPLE_MANIFEST_DIR) ] && $(MKDIR) $(SAMPLE_MANIFEST_DIR) || true
    $(PKGSEND) generate $(PKG_HARDLINKS:%=--target %) $(PROTO_DIR) | \
    $(PKGMOGRIFY) $(PKG_OPTIONS) /dev/fd/0 $(GENERATE_TRANSFORMS) | \
        sed -e '/^$$/d' -e '/^#.*$$/d' -e '/^dir .*$$/d' \
        sed -e '/^$$/d' -e '/^#.*$$/d' \
        -e '/\.la$$/d' -e '/\.pyo$$/d' -e '/usr\/lib\/python[23]\..*\.pyc$$/d' \
        -e '/usr\/lib\/python3\..*\/__pycache__\/.*/d'  | \
        $(PKGFMT) | \

 transforms/generate-cleanup

@@ -36,7 +36,9 @@
<transform dir file link hardlink license -> delete pkg.size .*>
<transform dir file link hardlink license -> delete owner .*>
<transform dir file link hardlink license -> delete group .*>
<transform dir file link hardlink license -> delete mode .*>
<transform dir link hardlink license -> delete mode .*>
# preserve mode for illumos-closed files
<transform file path=(?!opt/onbld/closed/root_i386) -> delete mode .*>

#<transform set name=pkg.fmri -> edit value "@[^ \t\n\r\f\v]*" "@$!(IPS_COMPONENT_VERSION),$!(BUILD_VERSION)">

@@ -109,5 +111,6 @@
<transform dir file link hardlink -> \
    edit target "\$!\((.*)\)" "$(\1)">

<transform dir path=mangled -> drop>
<transform dir file link hardlink path=mangled/(.*) -> drop>
<transform file link hardlink path=mangled/(.*) -> drop>
# drop all dirs except for illumos-closed
<transform dir path=(?!(opt/onbld/closed/root_i386(-nd)?/)) -> drop>