meta-agl-core: remove IMAGE_FSTYPES override - meta-agl

diff options

author	Scott Murray <scott.murray@konsulko.com>	2021-04-23 16:32:24 -0400
committer	Jan-Simon Moeller <jsmoeller@linuxfoundation.org>	2021-05-06 14:49:40 +0000
commit	b81c6beb388cafa6de9ca1baa13c3d529ca2f2d8 (patch)
tree	a285e615a041cbd31090047302772cef4e07315d /meta-agl-bsp/openembedded-layer/recipes-devtools
parent	ce23dd8f1f188cc845cdef64ba44ab9e9cd328a7 (diff)

meta-agl-core: remove IMAGE_FSTYPES override

Remove the anonymous python logic added to override any changes to IMAGE_FSTYPES via _append/_remove by BSPs to fix SPEC-3741. The updated Renesas BSP no longer does so, and removing this logic avoids issues when using meta-agl-core with distribution configurations other than poky-agl. Additionally: - Change the IMAGE_FSTYPES and INITRAMFS_FSTYPES assignments in poky-agl.conf back to regular ("=") instead of immediate (":=") so that things like the _appends being done to AGL_DEFAULT_IMAGE_FSTYPES for netboot and CI usecases will take affect. They were only currently working because of the later evaluation in the anonymous python logic that is being removed. - Rationalize agl-image-minimal.inc to just include agl-image-boot.inc, and remove the unnecessary use of the AGL_EXTRA_IMAGE_FSTYPES variable in agl-image-boot.inc. Bug-AGL: SPEC-3897 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Id655683c705678dd3ab1caff8980dba06f46a1bc Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26292 Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Tested-by: Jenkins Job builder account (cherry picked from commit e02c02ddbfeb9398268c3a4c4eabed1617de8ac3) Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26264 ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account

Diffstat (limited to 'meta-agl-bsp/openembedded-layer/recipes-devtools')

0 files changed, 0 insertions, 0 deletions

/* * Copyright (C) 2016 "IoT.bzh" * Author Fulup Ar Foll <fulup@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, something express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ #define _GNU_SOURCE #include <stdio.h> #include <string.h> #include "ctl-config.h" // Event dynamic API-V3 mode #ifdef AFB_BINDING_PREV3 PUBLIC void CtrlDispatchApiEvent (AFB_ApiT apiHandle, const char *evtLabel, struct json_object *eventJ) { AFB_ApiNotice (apiHandle, "Received event=%s, query=%s", evtLabel, json_object_get_string(eventJ)); // retrieve section config from api handle CtlConfigT *ctrlConfig = (CtlConfigT*) afb_dynapi_get_userdata(apiHandle); CtlActionT* actions = ctrlConfig->sections[CTL_SECTION_EVENT].actions; int index= ActionLabelToIndex(actions, evtLabel); if (index < 0) { AFB_ApiWarning(apiHandle, "CtlDispatchEvent: fail to find uid=%s in action event section", evtLabel); return; } // create a dummy source for action CtlSourceT source; source.uid = actions[index].uid; source.api = actions[index].api; source.request = NULL; // Best effort ignoring error to exec corresponding action (void) ActionExecOne (&source, &actions[index], eventJ); } #else // In API-V2 controller config is unique and static extern CtlConfigT *ctrlConfig; // call action attached to even name if any PUBLIC void CtrlDispatchV2Event(const char *evtLabel, json_object *eventJ) { CtlActionT* actions = ctrlConfig->sections[CTL_SECTION_EVENT].actions; int index= ActionLabelToIndex(actions, evtLabel); if (index < 0) { AFB_WARNING ("CtlDispatchEvent: fail to find uid=%s in action event section", evtLabel); return; } CtlSourceT source; source.uid = actions[index].uid; source.api = actions[index].api; source.request = AFB_ReqNone; // Best effort ignoring error to exec corresponding action (void) ActionExecOne (&source, &actions[index], eventJ); } #endif // onload section receive one action or an array of actions PUBLIC int EventConfig(AFB_ApiT apiHandle, CtlSectionT *section, json_object *actionsJ) { // Load time parse actions in config file if (actionsJ != NULL) { section->actions= ActionConfig(apiHandle, actionsJ, 0); if (!section->actions) { AFB_ApiError (apiHandle, "EventLoad config fail processing onload actions"); goto OnErrorExit; } } return 0; OnErrorExit: return 1; }


context:
space:
mode: