kvm: switch to gcc-10

Marcel Telka

2024-01-29 dab2916a3acd36890165c756fc33d213021bf133

kvm: switch to gcc-10

 components/openindiana/kvm/Makefile

@@ -17,6 +17,8 @@
# Copyright 2018, Michal Nowak
#

BUILD_STYLE = justmake

include ../../../make-rules/shared-macros.mk

COMPONENT_NAME=        illumos-kvm
@@ -31,17 +33,23 @@
PUBLISH_STAMP=
endif

include $(WS_TOP)/make-rules/prep.mk
include $(WS_TOP)/make-rules/justmake.mk
include $(WS_TOP)/make-rules/ips.mk
# Use the same gcc version as we use for building illumos-gate
GCC_VERSION = 10

include $(WS_TOP)/make-rules/common.mk

COMPONENT_PRE_CONFIGURE_ACTION = \
    $(CLONEY) $(SOURCE_DIR) $(@D)

COMPONENT_BUILD_ARGS += KERNEL_SOURCE=$(WS_TOP)/components/openindiana/illumos-gate/illumos-gate/
COMPONENT_BUILD_ARGS += PROTO_AREA=$(WS_TOP)/components/openindiana/illumos-gate/illumos-gate/proto/root_i386
COMPONENT_BUILD_ARGS += CC=$(CC)
COMPONENT_BUILD_ARGS += CTFBINDIR=/opt/onbld/bin/i386

COMPONENT_INSTALL_ARGS += DESTDIR=$(PROTO_DIR)

COMPONENT_TEST_ARGS += KERNEL_SOURCE=$(WS_TOP)/components/openindiana/illumos-gate/illumos-gate/

build_sparc:
    @echo "Not available."


 components/openindiana/kvm/kvm.p5m

@@ -18,6 +18,7 @@
<transform file dir path=.* -> default group sys>

set name=pkg.fmri value=pkg:/driver/i86pc/kvm@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="Kernel-based Virtual Machine hardware virtualisation system (requires Intel VT extension)"
set name=info.classification value="org.opensolaris.category.2008:System/Virtualization"
set name=info.upstream-url value=https://github.com/joyent/illumos-kvm

 components/openindiana/kvm/manifests/sample-manifest.p5m

@@ -10,10 +10,11 @@
#

#
# Copyright 2017 <contributor>
# Copyright 2024 <contributor>
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)

 components/openindiana/kvm/patches/Makefile.patch

@@ -1,24 +1,11 @@
--- illumos-kvm-9ad0cc7792fc1f0e0fc8985ba8810362707b9b20/Makefile.~1~    2019-10-07 15:25:35.000000000 +0000
+++ illumos-kvm-9ad0cc7792fc1f0e0fc8985ba8810362707b9b20/Makefile    2020-04-29 00:01:32.609934093 +0000
@@ -2,16 +2,15 @@
 # Copyright 2019 Joyent, Inc.
--- illumos-kvm-a82c4d2a9555461ee43e3fd3b6bbff10e6f5458a/Makefile.orig
+++ illumos-kvm-a82c4d2a9555461ee43e3fd3b6bbff10e6f5458a/Makefile
@@ -2,7 +2,7 @@
 # Copyright 2020 Joyent, Inc.
 #
 
-include        $(PWD)/../../../build.env
+#include        $(PWD)/../../../build.env
 
-KERNEL_SOURCE =    $(PWD)/../../illumos
+KERNEL_SOURCE =    $(PWD)/../../../illumos-gate/illumos-gate
 KERNEL_SOURCE =    $(PWD)/../../illumos
 MDB_SOURCE =    $(KERNEL_SOURCE)/usr/src/cmd/mdb
-PROTO_AREA =    $(PWD)/../../../proto
-STRAP_AREA =    $(PWD)/../../../proto.strap
+PROTO_AREA =    $(PWD)/../../../illumos-gate/illumos-gate/proto/root_i386
 
-CC =        $(STRAP_AREA)/usr/bin/gcc
+CC =        /usr/gcc/7/bin/gcc
 LD =        /usr/bin/ld
-CTFBINDIR =    $(KERNEL_SOURCE)/usr/src/tools/proto/*/opt/onbld/bin/i386
+CTFBINDIR =    /opt/onbld/bin/i386
 CTFCONVERT =    $(CTFBINDIR)/ctfconvert
 CSTYLE =    $(KERNEL_SOURCE)/usr/src/tools/scripts/cstyle
 HDRCHK =    tools/hdrchk

 components/openindiana/kvm/pkg5

@@ -6,4 +6,4 @@
        "driver/i86pc/kvm"
    ],
    "name": "illumos-kvm"
}
}