From 9c714c0765fe74288b613c93fac2265368fa4aaa Mon Sep 17 00:00:00 2001 From: Riku Nomoto Date: Thu, 26 Nov 2020 23:07:08 +0900 Subject: oem-pr-bs: initial commit This is the initial commit of agl-basesystem. - create new layer, meta-oem-production-readiness - create sub-layer, meta-agl-basesystem - add 1 feature to enable basesystem - add 2 bbclass which support to build - add packagegroups as place holder Bug-AGL: SPEC-3670 Signed-off-by: Riku Nomoto Change-Id: I457fb12086d913e8082843c87de9673df4d65710 --- meta-agl-devel.md | 4 ++++ .../meta-agl-basesystem/conf/layer.conf | 16 --------------- .../meta-agl-basesystem/recipes-core/.empty | 0 .../classes/agl-basesystem-common.bbclass | 7 +++++++ .../classes/agl-basesystem-hal.bbclass | 9 +++++++++ .../meta-agl-basesystem/classes/bshalmake.bbclass | 10 ++++++++++ .../meta-agl-basesystem/classes/bsmake.bbclass | 13 ++++++++++++ .../conf/include/agl-basesystem-base.inc | 11 +++++++++++ .../meta-agl-basesystem/conf/layer.conf | 16 +++++++++++++++ .../packagegroup-agl-basesystem-apis.bb | 11 +++++++++++ .../packagegroup-agl-basesystem-core.bb | 11 +++++++++++ .../packagegroup-agl-basesystem-hal.bb | 11 +++++++++++ .../packagegroup-agl-basesystem-service.bb | 11 +++++++++++ .../packagegroups/packagegroup-agl-basesystem.bb | 23 ++++++++++++++++++++++ .../feature/agl-basesystem/50_bblayers.conf.inc | 3 +++ templates/feature/agl-basesystem/50_local.conf.inc | 2 ++ .../README_feature_agl-basesystem.md | 10 ++++++++++ 17 files changed, 152 insertions(+), 16 deletions(-) delete mode 100644 meta-agl-toyota/meta-agl-basesystem/conf/layer.conf delete mode 100644 meta-agl-toyota/meta-agl-basesystem/recipes-core/.empty create mode 100644 meta-oem-production-readiness/meta-agl-basesystem/classes/agl-basesystem-common.bbclass create mode 100644 meta-oem-production-readiness/meta-agl-basesystem/classes/agl-basesystem-hal.bbclass create mode 100644 meta-oem-production-readiness/meta-agl-basesystem/classes/bshalmake.bbclass create mode 100644 meta-oem-production-readiness/meta-agl-basesystem/classes/bsmake.bbclass create mode 100644 meta-oem-production-readiness/meta-agl-basesystem/conf/include/agl-basesystem-base.inc create mode 100644 meta-oem-production-readiness/meta-agl-basesystem/conf/layer.conf create mode 100644 meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-apis.bb create mode 100644 meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-core.bb create mode 100644 meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-hal.bb create mode 100644 meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-service.bb create mode 100644 meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem.bb create mode 100644 templates/feature/agl-basesystem/50_bblayers.conf.inc create mode 100644 templates/feature/agl-basesystem/50_local.conf.inc create mode 100644 templates/feature/agl-basesystem/README_feature_agl-basesystem.md diff --git a/meta-agl-devel.md b/meta-agl-devel.md index 757eeec3..fdc29972 100755 --- a/meta-agl-devel.md +++ b/meta-agl-devel.md @@ -17,6 +17,7 @@ The `meta-agl-devel` layer contains the following files and sub-layers: ├── LICENSE.MIT ├── meta-agl-devel.md ├── meta-agl-jailhouse +├── meta-oem-production-readiness ├── meta-speech-framework ├── README.md └── templates @@ -30,5 +31,8 @@ The following list provides a summary of these sub-layers: * `meta-agl-jailhouse`: Provides Jailhouse partitioning hypervisor and supporting packages. +* `meta-oem-production-readiness`: Provides libraries and software packages of + IVI product readiness + * `templates`: Feature templates that support the `meta-agl-devel` layer. diff --git a/meta-agl-toyota/meta-agl-basesystem/conf/layer.conf b/meta-agl-toyota/meta-agl-basesystem/conf/layer.conf deleted file mode 100644 index d7e4fe06..00000000 --- a/meta-agl-toyota/meta-agl-basesystem/conf/layer.conf +++ /dev/null @@ -1,16 +0,0 @@ -# We have a conf and classes directory, append to BBPATH -BBPATH .= ":${LAYERDIR}" - -# We have a recipes directory, add to BBFILES -BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend" - -BBFILE_COLLECTIONS += "agl-basesystem" -BBFILE_PATTERN_agl-basesystem := "^${LAYERDIR}/" -BBFILE_PRIORITY_agl-basesystem = "60" - -# This should only be incremented on significant changes that will -# cause compatibility issues with other layers -LAYERVERSION_agl-basesystem = "1" -LAYERSERIES_COMPAT_agl-basesystem = "dunfell" -LAYERDEPENDS_agl-basesystem = "core" - diff --git a/meta-agl-toyota/meta-agl-basesystem/recipes-core/.empty b/meta-agl-toyota/meta-agl-basesystem/recipes-core/.empty deleted file mode 100644 index e69de29b..00000000 diff --git a/meta-oem-production-readiness/meta-agl-basesystem/classes/agl-basesystem-common.bbclass b/meta-oem-production-readiness/meta-agl-basesystem/classes/agl-basesystem-common.bbclass new file mode 100644 index 00000000..f944de5b --- /dev/null +++ b/meta-oem-production-readiness/meta-agl-basesystem/classes/agl-basesystem-common.bbclass @@ -0,0 +1,7 @@ +inherit bsmake + +DEPENDS_append = " agl-basefiles" + +EXTRA_OEMAKE = "'CXX=${CXX} ${CODINGRULES_CPP_21MM}' 'CC=${CC} ${CODINGRULES_C_21MM}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'DESTDIR=${D}' 'SDKTARGETSYSROOT=${STAGING_DIR_HOST}'" + +RDEPENDS_${PN} += " agl-basefiles " diff --git a/meta-oem-production-readiness/meta-agl-basesystem/classes/agl-basesystem-hal.bbclass b/meta-oem-production-readiness/meta-agl-basesystem/classes/agl-basesystem-hal.bbclass new file mode 100644 index 00000000..9db2f26a --- /dev/null +++ b/meta-oem-production-readiness/meta-agl-basesystem/classes/agl-basesystem-hal.bbclass @@ -0,0 +1,9 @@ +inherit bshalmake + +FILES_${PN}-dev_remove = "${FILES_SOLIBSDEV}" + +EXTRA_OEMAKE = "'CXX=${CXX}' 'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'DESTDIR=${D}' 'SDKTARGETSYSROOT=${STAGING_DIR_HOST}'" + +DEPENDS_append = " agl-basefiles" + + diff --git a/meta-oem-production-readiness/meta-agl-basesystem/classes/bshalmake.bbclass b/meta-oem-production-readiness/meta-agl-basesystem/classes/bshalmake.bbclass new file mode 100644 index 00000000..2deac96f --- /dev/null +++ b/meta-oem-production-readiness/meta-agl-basesystem/classes/bshalmake.bbclass @@ -0,0 +1,10 @@ +# base_do_install under poky's base.bbclass is empty so definition is needed. +bshalmake_do_install (){ + oe_runmake install + + install -d ${D}${includedir}/basesystem + install -D -m 644 ${S}/hal_api/*.h ${D}${includedir}/basesystem + +} + +EXPORT_FUNCTIONS do_install diff --git a/meta-oem-production-readiness/meta-agl-basesystem/classes/bsmake.bbclass b/meta-oem-production-readiness/meta-agl-basesystem/classes/bsmake.bbclass new file mode 100644 index 00000000..6e5caba9 --- /dev/null +++ b/meta-oem-production-readiness/meta-agl-basesystem/classes/bsmake.bbclass @@ -0,0 +1,13 @@ +# poky's base.bbclass must be named Makefile, makefile, or GNUmakefile to be processed. +# The names of the basesystem Makefile are Makefile.client and Makefile.server,so you +# need to define a do_compile to process the Makefile. +bsmake_do_compile (){ + oe_runmake -f ${BSMAKE_FILE} +} + +# base_do_install under poky's base.bbclass is empty so definition is needed. +bsmake_do_install (){ + oe_runmake -f ${BSMAKE_FILE} DESTDIR=${D} install +} + +EXPORT_FUNCTIONS do_compile do_install diff --git a/meta-oem-production-readiness/meta-agl-basesystem/conf/include/agl-basesystem-base.inc b/meta-oem-production-readiness/meta-agl-basesystem/conf/include/agl-basesystem-base.inc new file mode 100644 index 00000000..9ffd16ae --- /dev/null +++ b/meta-oem-production-readiness/meta-agl-basesystem/conf/include/agl-basesystem-base.inc @@ -0,0 +1,11 @@ +# AGL specific package configuration +# +# Add systemd configuration + +SHAREDIR = "${datadir}/basesystem" +INCLUDEDIR = "${includedir}/basesystem" +CONFDIR = "${sysconfdir}/basesystem" +LOCALDIR = "/var/local/lib/basesystem" + +BASESYSTEM_REVISION = "7ab637d7f01e712488deab0d318443ed9a81d5ae" + diff --git a/meta-oem-production-readiness/meta-agl-basesystem/conf/layer.conf b/meta-oem-production-readiness/meta-agl-basesystem/conf/layer.conf new file mode 100644 index 00000000..806408a5 --- /dev/null +++ b/meta-oem-production-readiness/meta-agl-basesystem/conf/layer.conf @@ -0,0 +1,16 @@ +# We have a conf and classes directory, append to BBPATH +BBPATH .= ":${LAYERDIR}" + +# We have a recipes directory, add to BBFILES +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "agl-basesystem" +BBFILE_PATTERN_agl-basesystem := "^${LAYERDIR}/" +BBFILE_PRIORITY_agl-basesystem = "60" + +# This should only be incremented on significant changes that will +# cause compatibility issues with other layers +LAYERVERSION_agl-basesystem = "1" +LAYERSERIES_COMPAT_agl-basesystem = "dunfell" +LAYERDEPENDS_agl-basesystem = "core" diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-apis.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-apis.bb new file mode 100644 index 00000000..91e9c6df --- /dev/null +++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-apis.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Native Service Package Groups" +LICENSE = "Apache-2.0" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-basesystem-apis \ + " + +RDEPENDS_${PN} += " \ + " diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-core.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-core.bb new file mode 100644 index 00000000..7a9df8ca --- /dev/null +++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-core.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "AGL Core Package Groups" +LICENSE = "Apache-2.0" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-basesystem-core \ + " + +RDEPENDS_${PN} += "\ + " diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-hal.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-hal.bb new file mode 100644 index 00000000..deb729dd --- /dev/null +++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-hal.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "hal Package Groups" +LICENSE = "Apache-2.0" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-basesystem-hal \ + " + +RDEPENDS_${PN} += " \ + " diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-service.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-service.bb new file mode 100644 index 00000000..788b97f6 --- /dev/null +++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-service.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Native Service Package Groups" +LICENSE = "Apache-2.0" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-basesystem-service \ + " + +RDEPENDS_${PN} += " \ + " diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem.bb new file mode 100644 index 00000000..0b4e0eb8 --- /dev/null +++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "BaseSystem Package Groups" +LICENSE = "Apache-2.0" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-basesystem \ + " + +ALLOW_EMPTY_${PN} = "1" + +RDEPENDS_${PN} += "\ + packagegroup-agl-image-minimal \ + " + +RDEPENDS_${PN} += "\ + packagegroup-agl-basesystem-core \ + packagegroup-agl-basesystem-apis \ + packagegroup-agl-basesystem-service \ + packagegroup-agl-basesystem-hal \ + " + + diff --git a/templates/feature/agl-basesystem/50_bblayers.conf.inc b/templates/feature/agl-basesystem/50_bblayers.conf.inc new file mode 100644 index 00000000..9cf89b24 --- /dev/null +++ b/templates/feature/agl-basesystem/50_bblayers.conf.inc @@ -0,0 +1,3 @@ +BBLAYERS =+ " \ + ${METADIR}/meta-agl-devel/meta-oem-production-readiness/meta-agl-basesystem \ +" diff --git a/templates/feature/agl-basesystem/50_local.conf.inc b/templates/feature/agl-basesystem/50_local.conf.inc new file mode 100644 index 00000000..8978d11a --- /dev/null +++ b/templates/feature/agl-basesystem/50_local.conf.inc @@ -0,0 +1,2 @@ +#see meta-agl-basesystem/conf/include/agl-basesystem-base.inc +require conf/include/agl-basesystem-base.inc diff --git a/templates/feature/agl-basesystem/README_feature_agl-basesystem.md b/templates/feature/agl-basesystem/README_feature_agl-basesystem.md new file mode 100644 index 00000000..dd3b26b2 --- /dev/null +++ b/templates/feature/agl-basesystem/README_feature_agl-basesystem.md @@ -0,0 +1,10 @@ +--- +description: Feature agl-basesystem +authors: Riku Nomoto +--- + +### Feature agl-basesystem + +*Description is missing - please complete file meta-agl-devel/templates/feature/agl-basesystem/README_feature_agl-basesystem.md* + + -- cgit 1.2.3-korg