diff options
| author |   takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-10-22 14:58:56 +0900 |
|---|---|---|
| committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-10-22 14:58:56 +0900 |
| commit | 4204309872da5cb401cbb2729d9e2d4869a87f42 (patch) | |
| tree | c7415e8600205e40ff7e91e8e5f4c411f30329f2 /meta-agl | |
| parent | 5b80bfd7bffd4c20d80b7c70a7130529e9a755dd (diff) | |
agl-basesystem 0.1sandbox/ToshikazuOhiwa/master
Diffstat (limited to 'meta-agl')
243 files changed, 3025 insertions, 2407 deletions
diff --git a/meta-agl/.gitreview b/meta-agl/.gitreview index 560b71ac..55b3adba 100644 --- a/meta-agl/.gitreview +++ b/meta-agl/.gitreview @@ -2,4 +2,4 @@ host=gerrit.automotivelinux.org port=29418 project=AGL/meta-agl -defaultbranch=halibut +defaultbranch=icefish diff --git a/meta-agl/meta-agl-basesystem/classes/agl-basesystem-capability.bbclass b/meta-agl/meta-agl-basesystem/classes/agl-basesystem-capability.bbclass index 3170cc9c..542601e7 100644 --- a/meta-agl/meta-agl-basesystem/classes/agl-basesystem-capability.bbclass +++ b/meta-agl/meta-agl-basesystem/classes/agl-basesystem-capability.bbclass @@ -1,32 +1,25 @@ pkg_postinst_ontarget_${PN}_append () { -df / --exclude-type=nfs > /dev/null -IS_EMMC_BOOT=$? - -if [ $IS_EMMC_BOOT -eq 0 ]; then CAPVARS="${CAPABILITY}" IFS=" " - for cap in $CAPVARS; do - capability=`echo $cap | cut -f 1 -d ":"` - file=`echo $cap | cut -f 2 -d ":"` - setcap $capability $D$file - done -else - CAPVARS="${CAPABILITY}" - IFS=" " - for cap in $CAPVARS; do - capability=`echo $cap | cut -f 1 -d ":"` - file=`echo $cap | cut -f 2 -d ":"` - TCAP_NAME="/tmp/${file##*/}" - if [ ! -L ${file} ]; then - cp -a ${file} ${TCAP_NAME} - mv ${file} ${file}.org - ln -fs ${TCAP_NAME} ${file} - else - cp -a ${file}.org ${TCAP_NAME} - fi - setcap ${capability} ${TCAP_NAME} + for cap in ${CAPVARS}; do + capability=`echo ${cap} | cut -f 1 -d ":"` + file=`echo ${cap} | cut -f 2 -d ":"` + setcap ${capability} $D${file} + + df -T / | grep nfs > /dev/null + IS_EMMC_BOOT=$? + if [ $IS_EMMC_BOOT -eq 0 ]; then + TCAP_NAME="/tmp/${file##*/}" + if [ ! -L ${file} ]; then + cp -a ${file} ${TCAP_NAME} + mv ${file} ${file}.org + ln -fs ${TCAP_NAME} ${file} + else + cp -a ${file}.org ${TCAP_NAME} + fi + setcap ${capability} ${TCAP_NAME} + fi done -fi } #RDEPENDS_${PN} += "libcap-bin" -PACKAGE_WRITE_DEPS = "libcap-native" +PACKAGE_WRITE_DEPS = "libcap-native coreutils-native" diff --git a/meta-agl/meta-agl-basesystem/classes/agl-basesystem-common.bbclass b/meta-agl/meta-agl-basesystem/classes/agl-basesystem-common.bbclass index cde65275..d20564dd 100644 --- a/meta-agl/meta-agl-basesystem/classes/agl-basesystem-common.bbclass +++ b/meta-agl/meta-agl-basesystem/classes/agl-basesystem-common.bbclass @@ -39,7 +39,7 @@ sysroot_stage_all_append(){ sysroot_stage_dir ${D}/usr/agl ${SYSROOT_DESTDIR}/usr/agl sysroot_stage_dir ${D}/usr/agl/conf/systemmanager ${SYSROOT_DESTDIR}/usr/agl/conf/systemmanager sysroot_stage_dir ${D}/usr/agl/conf/backup_manager ${SYSROOT_DESTDIR}/usr/agl/conf/backup_manager - sysroot_stage_dir ${D}/nv/npp ${SYSROOT_DESTDIR}/nv/npp + sysroot_stage_dir ${D}/nv/BS/ns/npp/rwdata ${SYSROOT_DESTDIR}/nv/BS/ns/npp/rwdata sysroot_stage_dir ${D}/etc/udev/rules.d ${SYSROOT_DESTDIR}/etc/udev/rules.d sysroot_stage_dir ${D}/etc ${SYSROOT_DESTDIR}/etc sysroot_stage_dir ${D}/etc/ppp ${SYSROOT_DESTDIR}/etc/ppp diff --git a/meta-agl/meta-agl-basesystem/classes/agl-basesystem-hal.bbclass b/meta-agl/meta-agl-basesystem/classes/agl-basesystem-hal.bbclass new file mode 100644 index 00000000..d1da250b --- /dev/null +++ b/meta-agl/meta-agl-basesystem/classes/agl-basesystem-hal.bbclass @@ -0,0 +1,46 @@ +FILES_${PN} = " \ + /usr/lib/*.so \ + /usr/bin/* \ +" +FILES_SOLIBSDEV = "" + +FILES_${PN}-dev += " \ + /usr/include/* \ + /usr/agl/include/* \ +" +FILES_${PN}-staticdev = "" + +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_SYSROOT_STRIP = "1" +INSANE_SKIP_${PN} = "ldflags" +INSANE_SKIP_${PN}-dev = "dev-elf" +TARGET_CC_ARCH += "${LDFLAGS}" +SOLIBS = ".so" +SECTION = "libs" + +DEPENDS += " " + +EXTRA_OEMAKE = "'CXX=${CXX}' 'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'DESTDIR=${D}' 'SDKTARGETSYSROOT=${STAGING_DIR_HOST}'" + +EXTRA_ARCH ?= " ARCH=arm64" +EXTRA_OEMAKE_append += " ${EXTRA_ARCH}" + +do_compile[depends] += "agl-basefiles:do_populate_sysroot" +do_compile (){ + cd ${S} + oe_runmake +} + +do_install (){ + cd ${S}/hal_api + install -d ${D}/usr/include + install -D -m 644 *.h ${D}/usr/include + install -d ${D}/usr/lib/ + + cd ${S} + oe_runmake install +} + +sysroot_stage_all_append(){ + sysroot_stage_dir ${D}/usr/agl ${SYSROOT_DESTDIR}/usr/agl +} diff --git a/meta-agl/meta-agl-basesystem/conf/include/agl-basesystem-base.inc b/meta-agl/meta-agl-basesystem/conf/include/agl-basesystem-base.inc index b8f14408..876baaa5 100644 --- a/meta-agl/meta-agl-basesystem/conf/include/agl-basesystem-base.inc +++ b/meta-agl/meta-agl-basesystem/conf/include/agl-basesystem-base.inc @@ -4,7 +4,7 @@ DISTRO_FEATURES_append = " systemd ${DISTRO_FEATURES_LIBC}" #VIRTUAL-RUNTIME_init_manager = "systemd" -TOOLCHAIN_HOST_TASK_append += " nativesdk-os-rpclibrary-tool nativesdk-perl-module-app-cpan nativesdk-perl-module-json-pp" +TOOLCHAIN_HOST_TASK_append += " nativesdk-os-rpclibrary-tool nativesdk-perl-module-app-cpan nativesdk-perl-module-json-pp" # add the static lib to SDK toolchain SDKIMAGE_FEATURES_append += " staticdev-pkgs dev-pkgs tools-debug tools-profile headerfiles-pkgs nativesdk-os-rpclibrary-tool" diff --git a/meta-agl/meta-agl-basesystem/conf/layer.conf b/meta-agl/meta-agl-basesystem/conf/layer.conf index d983f9fa..4052619f 100644 --- a/meta-agl/meta-agl-basesystem/conf/layer.conf +++ b/meta-agl/meta-agl-basesystem/conf/layer.conf @@ -11,6 +11,6 @@ BBFILE_PATTERN_agl-basesystem = "^${LAYERDIR}/" BBFILE_PRIORITY_agl-basesystem = "70" # for agl-basefiles recipe -HOSTTOOLS += "xpath" +HOSTTOOLS += "xpath xmllint" LAYERSERIES_COMPAT_agl-basesystem = "thud" diff --git a/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-ns-backupmanager/agl-service-ns-backupmanager_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-ns-backupmanager/agl-service-ns-backupmanager_1.0.0.bb index b9cea80f..99d77f82 100644 --- a/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-ns-backupmanager/agl-service-ns-backupmanager_1.0.0.bb +++ b/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-ns-backupmanager/agl-service-ns-backupmanager_1.0.0.bb @@ -8,8 +8,8 @@ inherit agl-basesystem-common agl-basesystem-capability CAPABILITY = "cap_dac_override+ep:/usr/agl/bin/NS_BackupMgr" FILES_${PN} += " \ - /usr/agl/conf/backup_manager/* \ /usr/agl/bin/* \ + /nv/BS/ns/backup_manager/* \ " SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/ns-backupmanager" @@ -21,15 +21,19 @@ S = "${WORKDIR}/git" DEPENDS += " \ libxml2-native \ ns-frameworkunified \ + libnv-hal \ ns-backupmanager \ ss-interfaceunified \ ss-romaccesslibrary \ + os-vehicleparameterlibrary \ " RDEPENDS_${PN} += " \ ns-frameworkunified \ + libnv-hal \ ns-backupmanager \ ss-interfaceunified \ ss-romaccesslibrary \ + os-vehicleparameterlibrary \ " EXTRA_MAKEFILE = " -f Makefile.server" EXTRA_OEMAKE += "${EXTRA_MAKEFILE}" diff --git a/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-ps-communication/agl-service-ps-communication_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-ps-communication/agl-service-ps-communication_1.0.0.bb index d147ceb9..9b21b7ff 100644 --- a/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-ps-communication/agl-service-ps-communication_1.0.0.bb +++ b/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-ps-communication/agl-service-ps-communication_1.0.0.bb @@ -21,7 +21,7 @@ DEPENDS += " \ os-posixbasedos001legacylibrary \ ss-interfaceunified \ ss-romaccesslibrary \ - os-vehicleparameterlibrary \ + libcan-hal \ " RDEPENDS_${PN} += " \ ns-frameworkunified \ @@ -29,7 +29,7 @@ RDEPENDS_${PN} += " \ os-posixbasedos001legacylibrary \ ss-interfaceunified \ ss-romaccesslibrary \ - os-vehicleparameterlibrary \ + libcan-hal \ " EXTRA_MAKEFILE = " -f Makefile.server" diff --git a/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-ss-loggerservice/agl-service-ss-loggerservice_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-ss-loggerservice/agl-service-ss-loggerservice_1.0.0.bb index 5012ebf0..b0b1f525 100644 --- a/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-ss-loggerservice/agl-service-ss-loggerservice_1.0.0.bb +++ b/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-ss-loggerservice/agl-service-ss-loggerservice_1.0.0.bb @@ -9,11 +9,9 @@ CAPABILITY = "cap_dac_override+ep:/usr/agl/bin/SS_LoggerService" FILES_${PN} += " \ /usr/agl/bin/* \ - /usr/agl/conf/* \ - /usr/agl/conf/syslogd/* \ - /usr/agl/share/logrotate/* \ " FILES_${PN}-staticdev += " /usr/agl/lib/*.a " +FILES_${PN} += "/nv/BS/ss/logger_service/rwdata/frameworkunifiedlog" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/ss-loggerservice" SRCREV = "${AUTOREV}" @@ -32,6 +30,9 @@ DEPENDS += " libtar \ os-vehicleparameterlibrary \ os-posixbasedos001legacylibrary \ logrotate \ + ns-memorygpioaccesslibrary \ + vs-clock \ + vs-diagrecord \ " RDEPENDS_${PN} += " \ ss-config \ @@ -43,6 +44,9 @@ RDEPENDS_${PN} += " \ ns-backupmanager \ os-vehicleparameterlibrary \ os-posixbasedos001legacylibrary \ + ns-memorygpioaccesslibrary \ + vs-clock \ + vs-diagrecord \ " EXTRA_MAKEFILE = " -f Makefile.server" EXTRA_OEMAKE += "${EXTRA_MAKEFILE}" diff --git a/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-ss-resourcemanager/agl-service-ss-resourcemanager_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-ss-resourcemanager/agl-service-ss-resourcemanager_1.0.0.bb index 148231f1..4624a9f6 100644 --- a/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-ss-resourcemanager/agl-service-ss-resourcemanager_1.0.0.bb +++ b/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-ss-resourcemanager/agl-service-ss-resourcemanager_1.0.0.bb @@ -20,18 +20,18 @@ DEPENDS += " \ ss-resourcemanager \ ns-commonlibrary \ ns-frameworkunified \ - os-vehicleparameterlibrary \ os-rpclibrary \ os-eventlibrary \ + libsoctemperature-hal \ " RDEPENDS_${PN} += " \ ss-interfaceunified \ ss-resourcemanager \ ns-commonlibrary \ ns-frameworkunified \ - os-vehicleparameterlibrary \ os-rpclibrary \ os-eventlibrary \ + libsoctemperature-hal \ " EXTRA_MAKEFILE=" -f Makefile.server" EXTRA_OEMAKE += "${EXTRA_MAKEFILE} -j 1 'CXX=${CXX} -Wl,--warn-unresolved-symbols' 'CC=${CC} -Wl,--warn-unresolved-symbols' " diff --git a/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-ss-systemmanager/agl-service-ss-systemmanager_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-ss-systemmanager/agl-service-ss-systemmanager_1.0.0.bb index 397c349b..1aeea87d 100644 --- a/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-ss-systemmanager/agl-service-ss-systemmanager_1.0.0.bb +++ b/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-ss-systemmanager/agl-service-ss-systemmanager_1.0.0.bb @@ -9,6 +9,12 @@ CAPABILITY = "cap_sys_nice,cap_setuid,cap_setgid,cap_sys_resource+ep:/usr/agl/bi FILES_${PN} += " /usr/agl/bin/* " +FILES_${PN} += "/usr/agl/conf/BS/ss/system_manager/rwdata/sm_launch.cfg" +FILES_${PN} += "/usr/agl/share/BS/ss/system_manager/rodata/version.txt" +FILES_${PN} += "/usr/agl/share/BS/ss/system_manager/rodata/PhaseInfo.txt" + +FILES_${PN} += "/nv/BS/ss/system_manager/*" + SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/ss-systemmanager" SRCREV = "${AUTOREV}" @@ -26,6 +32,10 @@ DEPENDS += " \ os-vehicleparameterlibrary \ os-posixbasedos001legacylibrary \ os-rpclibrary \ + os-eventlibrary \ + libpower-hal \ + vs-clock \ + vs-diagcode \ " RDEPENDS_${PN} += " \ agl-service-ss-resourcemanager \ @@ -38,6 +48,10 @@ RDEPENDS_${PN} += " \ os-vehicleparameterlibrary \ os-posixbasedos001legacylibrary \ os-rpclibrary \ + os-eventlibrary \ + libpower-hal \ + vs-clock \ + vs-diagcode \ " EXTRA_MAKEFILE = " -f Makefile.server" diff --git a/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-ss-taskmanager/agl-service-ss-taskmanager_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-ss-taskmanager/agl-service-ss-taskmanager_1.0.0.bb index 683cda2d..30c91613 100644 --- a/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-ss-taskmanager/agl-service-ss-taskmanager_1.0.0.bb +++ b/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-ss-taskmanager/agl-service-ss-taskmanager_1.0.0.bb @@ -25,6 +25,7 @@ DEPENDS += " \ ss-taskmanager \ ns-frameworkunified \ ns-commonlibrary \ + os-eventlibrary \ os-rpclibrary \ os-vehicleparameterlibrary \ libxml2-native \ @@ -36,6 +37,7 @@ RDEPENDS_${PN} += " \ ss-taskmanager \ ns-frameworkunified \ ns-commonlibrary \ + os-eventlibrary \ os-rpclibrary \ os-vehicleparameterlibrary \ " diff --git a/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-vs-positioning/agl-service-vs-positioning_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-vs-positioning/agl-service-vs-positioning_1.0.0.bb index e9a0c795..05a149b3 100644 --- a/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-vs-positioning/agl-service-vs-positioning_1.0.0.bb +++ b/meta-agl/meta-agl-basesystem/recipes-apis/agl-service-vs-positioning/agl-service-vs-positioning_1.0.0.bb @@ -13,6 +13,9 @@ FILES_${PN} += " \ FILES_${PN}-staticdev += " \ /usr/agl/lib/*.a \ " + +FILES_${PN} += "/nv/BS/vs/positioning/*" + SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/vs-positioning" SRCREV = "${AUTOREV}" @@ -30,8 +33,12 @@ DEPENDS += " \ os-vehicleparameterlibrary \ os-eventlibrary \ ps-communication \ + libpositioning-hal \ vs-positioningbaselibrary \ vs-positioning \ + ps-communicationusb \ + vs-clock \ + vs-vehicle \ " RDEPENDS_${PN} += " \ ss-config \ @@ -43,8 +50,11 @@ RDEPENDS_${PN} += " \ os-vehicleparameterlibrary \ os-eventlibrary \ ps-communication \ + libpositioning-hal \ vs-positioningbaselibrary \ vs-positioning \ + vs-clock \ + vs-vehicle \ " EXTRA_MAKEFILE=" -f Makefile.server" EXTRA_OEMAKE += " ${EXTRA_MAKEFILE} -j 1 'CXX=${CXX} -Wl,--warn-unresolved-symbols' 'CC=${CC} -Wl,--warn-unresolved-symbols' " diff --git a/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/agl-basefiles_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/agl-basefiles_1.0.0.bb index bbe6f008..59ffbed3 100644 --- a/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/agl-basefiles_1.0.0.bb +++ b/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/agl-basefiles_1.0.0.bb @@ -9,7 +9,7 @@ SRC_URI += " \ file://LICENSE \ file://bin \ file://share \ - file://npp \ + file://BS \ file://include \ file://agldd \ " @@ -18,11 +18,11 @@ FILES_${PN} += " \ /bin/* \ /agldd/* \ /include/* \ - /npp/* \ + /BS/ns/npp/rwdata/* \ /share/* \ /usr/agl/conf/backup_manager/* \ /usr/agl/conf/systemmanager/* \ - /nv/npp/* \ + /nv/BS/ns/npp/rwdata/* \ " #ALLOW_EMPTY_${PN} = "1" @@ -43,16 +43,16 @@ do_package_qa[noexec] = "1" do_install[depends] += "virtual/kernel:do_shared_workdir" do_install() { - install -C -d ${D}/nv/npp/ install -C -d ${D}/usr/agl/share/ install -C -d ${D}/usr/agl/include/agldd/ - install -C -d ${D}/usr/include/linux/ + install -C -d ${D}/usr/include/linux/ + install -C -d ${D}/nv/BS/ns/npp/rwdata/ install -m 644 ${WORKDIR}/agldd/* ${D}/usr/agl/include/agldd/ install -m 644 ${WORKDIR}/include/* ${D}/usr/agl/include/ install -m 644 ${WORKDIR}/share/* ${D}/usr/agl/share/ - install -m 644 ${WORKDIR}/npp/* ${D}/nv/npp/ - install -m 775 ${WORKDIR}/bin/launch_xml2cfg.sh ${D}/usr/agl/share/ - install -D -m 0644 ${TMPDIR}/work-shared/${MACHINE}/kernel-build-artifacts/include/generated/autoconf.h ${D}/usr/include/linux/ + install -m 644 ${WORKDIR}/BS/ns/npp/rwdata/* ${D}/nv/BS/ns/npp/rwdata + install -m 775 ${WORKDIR}/bin/launch_xml2cfg.sh ${D}/usr/agl/share/ + install -D -m 0644 ${TMPDIR}/work-shared/${MACHINE}/kernel-build-artifacts/include/generated/autoconf.h ${D}/usr/include/linux/ } sysroot_stage_all_append(){ diff --git a/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/files/npp/version.txt b/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/files/BS/ns/npp/rwdata/version.txt index d00491fd..d00491fd 100644 --- a/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/files/npp/version.txt +++ b/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/files/BS/ns/npp/rwdata/version.txt diff --git a/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/files/bin/launch_xml2cfg.sh b/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/files/bin/launch_xml2cfg.sh index dfa1fa99..dfa1fa99 100755..100644 --- a/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/files/bin/launch_xml2cfg.sh +++ b/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/files/bin/launch_xml2cfg.sh diff --git a/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/files/include/agl_thread.h b/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/files/include/agl_thread.h index 4f10c162..3be35958 100644 --- a/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/files/include/agl_thread.h +++ b/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/files/include/agl_thread.h @@ -58,53 +58,53 @@ //======= exec from system manager ============= #define MN_NS_SHAREDMEM "NS_SharedMem" -#define PR_NS_SHAREDMEM_S "25" -#define PR_NS_SHAREDMEM (25) +#define PR_NS_SHAREDMEM_S "0" +#define PR_NS_SHAREDMEM (0) #define MN_NS_NPPSERVICE "NS_NPPService" -#define PR_NS_NPPSERVICE_S "25" -#define PR_NS_NPPSERVICE (25) +#define PR_NS_NPPSERVICE_S "0" +#define PR_NS_NPPSERVICE (0) #define TN_NS_NPPREADWKR "NS_NPPReadWkr" - #define PR_NS_NPPREADWKR_S "25" - #define PR_NS_NPPREADWKR (25) + #define PR_NS_NPPREADWKR_S "0" + #define PR_NS_NPPREADWKR (0) #define TN_NS_NPPWRITEWKR "NS_NPPWriteWkr" - #define PR_NS_NPPWRITEWKR_S "25" - #define PR_NS_NPPWRITEWKR (25) + #define PR_NS_NPPWRITEWKR_S "0" + #define PR_NS_NPPWRITEWKR (0) #define TN_NS_NPPIPWKR "NS_NPPIPWkr" - #define PR_NS_NPPIPWKR_S "25" - #define PR_NS_NPPIPWKR (25) + #define PR_NS_NPPIPWKR_S "0" + #define PR_NS_NPPIPWKR (0) #define MN_NS_BACKUPMGR "NS_BackupMgr" -#define PR_NS_BACKUPMGR_S "25" -#define PR_NS_BACKUPMGR (25) +#define PR_NS_BACKUPMGR_S "0" +#define PR_NS_BACKUPMGR (0) #define TN_NS_BKUPNAND "NS_BkupNAND" - #define PR_NS_BKUPNAND_S "25" - #define PR_NS_BKUPNAND (25) + #define PR_NS_BKUPNAND_S "0" + #define PR_NS_BKUPNAND (0) #define TN_NS_BKUPDELAY "NS_BkupDelay" - #define PR_NS_BKUPDELAY_S "25" - #define PR_NS_BKUPDELAY (25) + #define PR_NS_BKUPDELAY_S "0" + #define PR_NS_BKUPDELAY (0) #define MN_SS_DEVDETECTSRV "SS_DevDetectSrv" -#define PR_SS_DEVDETECTSRV_S "20" -#define PR_SS_DEVDETECTSRV (20) +#define PR_SS_DEVDETECTSRV_S "0" +#define PR_SS_DEVDETECTSRV (0) #define TN_SS_DETECT_USB "SS_Detect_USB" - #define PR_SS_DETECT_USB_S "20" - #define PR_SS_DETECT_USB (20) + #define PR_SS_DETECT_USB_S "0" + #define PR_SS_DETECT_USB (0) #define TN_SS_DETECT_SD "SS_Detect_SD" - #define PR_SS_DETECT_SD_S "20" - #define PR_SS_DETECT_SD (20) + #define PR_SS_DETECT_SD_S "0" + #define PR_SS_DETECT_SD (0) #define TN_SS_MONITOR_OVC "SS_Monitor_OVC" - #define PR_SS_MONITOR_OVC_S "20" - #define PR_SS_MONITOR_OVC (20) + #define PR_SS_MONITOR_OVC_S "0" + #define PR_SS_MONITOR_OVC (0) #define MN_SS_LOGGERSRV "SS_LoggerSrv" #define PR_SS_LOGGERSRV_S PR_TSS_S @@ -139,64 +139,64 @@ #define PR_UDEVD (1) #define MN_COMMUNICATION "Communication" -#define PR_COMMUNICATION_S "30" -#define PR_COMMUNICATION (30) +#define PR_COMMUNICATION_S "0" +#define PR_COMMUNICATION (0) #define TN_DEV_SYSCOM_TMR "DEV_SYSCOM_TMR" - #define PR_DEV_SYSCOM_TMR_S "30" - #define PR_DEV_SYSCOM_TMR (30) + #define PR_DEV_SYSCOM_TMR_S "0" + #define PR_DEV_SYSCOM_TMR (0) #define TN_DEV_SYSCOM_RCV "DEV_SYSCOM_RCV" - #define PR_DEV_SYSCOM_RCV_S "30" - #define PR_DEV_SYSCOM_RCV (30) + #define PR_DEV_SYSCOM_RCV_S "0" + #define PR_DEV_SYSCOM_RCV (0) #define TN_DEV_SYSCOM_MAIN "DEV_SYSCOM_MAIN" - #define PR_DEV_SYSCOM_MAIN_S "30" - #define PR_DEV_SYSCOM_MAIN (30) + #define PR_DEV_SYSCOM_MAIN_S "0" + #define PR_DEV_SYSCOM_MAIN (0) #define TN_TGWCOM "TGWCOM" - #define PR_TGWCOM_S "30" - #define PR_TGWCOM (30) + #define PR_TGWCOM_S "0" + #define PR_TGWCOM (0) #define TN__CWORD83_ "_CWORD83_" - #define PR__CWORD83__S "30" - #define PR__CWORD83_ (30) + #define PR__CWORD83__S "0" + #define PR__CWORD83_ (0) #define TN_CAN_COM_PROT "CAN_COM_PROT" - #define PR_CAN_COM_PROT_S "30" - #define PR_CAN_COM_PROT (30) + #define PR_CAN_COM_PROT_S "0" + #define PR_CAN_COM_PROT (0) #define MN_PS_PSMSHADOW "PS_PSMShadow" -#define PR_PS_PSMSHADOW_S "30" -#define PR_PS_PSMSHADOW (30) +#define PR_PS_PSMSHADOW_S "0" +#define PR_PS_PSMSHADOW (0) #define MN_COMMSH4A "CommSH4A" -#define PR_COMMSH4A_S "30" -#define PR_COMMSH4A (30) +#define PR_COMMSH4A_S "0" +#define PR_COMMSH4A (0) #define TN_DEV_SH4A_SND "DEV_SH4ACOM_SND" - #define PR_DEV_SH4A_SND_S "30" - #define PR_DEV_SH4A_SND (30) + #define PR_DEV_SH4A_SND_S "0" + #define PR_DEV_SH4A_SND (0) #define TN_DEV_SH4A_RCV "DEV_SH4ACOM_RCV" - #define PR_DEV_SH4A_RCV_S "30" - #define PR_DEV_SH4A_RCV (30) + #define PR_DEV_SH4A_RCV_S "0" + #define PR_DEV_SH4A_RCV (0) #define TN_DEV_SH4A_MON "DEV_SH4ACOM_MON" - #define PR_DEV_SH4A_MON_S "30" - #define PR_DEV_SH4A_MON (30) + #define PR_DEV_SH4A_MON_S "0" + #define PR_DEV_SH4A_MON (0) #define MN_PS_COMMUSB "PS_CommUSB" -#define PR_PS_COMMUSB_S "30" -#define PR_PS_COMMUSB (30) +#define PR_PS_COMMUSB_S "0" +#define PR_PS_COMMUSB (0) #define TN_COMMUSB_RCV "COMMUSB_RCV" - #define PR_COMMUSB_RCV_S "30" - #define PR_COMMUSB_RCV (30) + #define PR_COMMUSB_RCV_S "0" + #define PR_COMMUSB_RCV (0) #define TN_COMMUSB_DIAG "COMMUSB_DIAG" - #define PR_COMMUSB_DIAG_S "30" - #define PR_COMMUSB_DIAG (30) + #define PR_COMMUSB_DIAG_S "0" + #define PR_COMMUSB_DIAG (0) #define MN_PS_CANGW_M "CANGW_M" #define PR_PS_CANGW_M_S PR_TSS_S @@ -223,8 +223,8 @@ #define PR_CANGW_S_DIAG PR_TSS #define MN_LANSERVER "LanServer" -#define PR_LANSERVER_S "20" -#define PR_LANSERVER (20) +#define PR_LANSERVER_S "0" +#define PR_LANSERVER (0) #define MN_PS_CDR "ps_cdr" #define PR_PS_CDR_S PR_TSS_S @@ -267,248 +267,248 @@ #define PR_POSITIONING_GPS_ROLOVR PR_TSS #define MN_CLOCK "clock" -#define PR_CLOCK_S "20" -#define PR_CLOCK (20) +#define PR_CLOCK_S "0" +#define PR_CLOCK (0) #define TN_CLOCK_MNG "ClockMng" - #define PR_CLOCK_MNG_S "20" - #define PR_CLOCK_MNG (20) + #define PR_CLOCK_MNG_S "0" + #define PR_CLOCK_MNG (0) #define MN_VEHICLE "vehicle" -#define PR_VEHICLE_S "20" -#define PR_VEHICLE (20) +#define PR_VEHICLE_S "0" +#define PR_VEHICLE (0) #define TN_VEHICLE_SENS "VehicleSens" - #define PR_VEHICLE_SENS_S "20" - #define PR_VEHICLE_SENS (20) + #define PR_VEHICLE_SENS_S "0" + #define PR_VEHICLE_SENS (0) #define TN_LINE_SENS_DRV "LineSensDrv" - #define PR_LINE_SENS_DRV_S "20" - #define PR_LINE_SENS_DRV (20) + #define PR_LINE_SENS_DRV_S "0" + #define PR_LINE_SENS_DRV (0) #define MN_SS_POWERSERVICE "SS_PowerService" -#define PR_SS_POWERSERVICE_S "30" -#define PR_SS_POWERSERVICE (30) +#define PR_SS_POWERSERVICE_S "0" +#define PR_SS_POWERSERVICE (0) #define MN_SS_TASKMANAGER "SS_TaskManager" -#define PR_SS_TASKMANAGER_S "20" -#define PR_SS_TASKMANAGER (20) +#define PR_SS_TASKMANAGER_S "0" +#define PR_SS_TASKMANAGER (0) #define TN_SS_TSKMTIMER "SS_TskmTimer" - #define PR_SS_TSKMTIMER_S "20" - #define PR_SS_TSKMTIMER (20) + #define PR_SS_TSKMTIMER_S "0" + #define PR_SS_TSKMTIMER (0) #define MN_SOUND "Sound" -#define PR_SOUND_S "45" -#define PR_SOUND (45) +#define PR_SOUND_S "0" +#define PR_SOUND (0) #define TN_VG_SNDSRCMGR "VG_SNDSRCMGR" - #define PR_VG_SNDSRCMGR_S "40" - #define PR_VG_SNDSRCMGR (40) + #define PR_VG_SNDSRCMGR_S "0" + #define PR_VG_SNDSRCMGR (0) #define TN_SND_INPUTCTRL "SND_INPUTCTRL" - #define PR_SND_INPUTCTRL_S "40" - #define PR_SND_INPUTCTRL (40) + #define PR_SND_INPUTCTRL_S "0" + #define PR_SND_INPUTCTRL (0) #define TN_SND_DEVCTRL "SND_DEVCTRL" - #define PR_SND_DEVCTRL_S "40" - #define PR_SND_DEVCTRL (40) + #define PR_SND_DEVCTRL_S "0" + #define PR_SND_DEVCTRL (0) #define TN_SND_VCETRFCTRL "SND_VCETRFCTRL" - #define PR_SND_VCETRFCTRL_S "45" - #define PR_SND_VCETRFCTRL (45) + #define PR_SND_VCETRFCTRL_S "0" + #define PR_SND_VCETRFCTRL (0) #define TN_SND_VCETRFWRT1 "SND_VCETRFWRT1" - #define PR_SND_VCETRFWRT1_S "45" - #define PR_SND_VCETRFWRT1 (45) + #define PR_SND_VCETRFWRT1_S "0" + #define PR_SND_VCETRFWRT1 (0) #define TN_SND_VCETRFWRT2 "SND_VCETRFWRT2" - #define PR_SND_VCETRFWRT2_S "45" - #define PR_SND_VCETRFWRT2 (45) + #define PR_SND_VCETRFWRT2_S "0" + #define PR_SND_VCETRFWRT2 (0) #define TN_VG_SNDCTRL_BSCF "VG_SNDCTRL_BSCF" - #define PR_VG_SNDCTRL_BSCF_S "25" - #define PR_VG_SNDCTRL_BSCF (25) + #define PR_VG_SNDCTRL_BSCF_S "0" + #define PR_VG_SNDCTRL_BSCF (0) #define TN_VG_SNDCTRL_BSCR "VG_SNDCTRL_BSCR" - #define PR_VG_SNDCTRL_BSCR_S "25" - #define PR_VG_SNDCTRL_BSCR (25) + #define PR_VG_SNDCTRL_BSCR_S "0" + #define PR_VG_SNDCTRL_BSCR (0) #define TN_VG_SNDCTRL_ITRT "VG_SNDCTRL_ITRT" - #define PR_VG_SNDCTRL_ITRT_S "25" - #define PR_VG_SNDCTRL_ITRT (25) + #define PR_VG_SNDCTRL_ITRT_S "0" + #define PR_VG_SNDCTRL_ITRT (0) #define TN_CVRS_OPRT_OUT_1 "CVRS_OPRT_OUT_1" - #define PR_CVRS_OPRT_OUT_1_S "45" - #define PR_CVRS_OPRT_OUT_1 (45) + #define PR_CVRS_OPRT_OUT_1_S "0" + #define PR_CVRS_OPRT_OUT_1 (0) #define TN_CVRS_OPRT_OUT_2 "CVRS_OPRT_OUT_2" - #define PR_CVRS_OPRT_OUT_2_S "45" - #define PR_CVRS_OPRT_OUT_2 (45) + #define PR_CVRS_OPRT_OUT_2_S "0" + #define PR_CVRS_OPRT_OUT_2 (0) #define TN_CVRS_OPRT_OUT_3 "CVRS_OPRT_OUT_3" - #define PR_CVRS_OPRT_OUT_3_S "45" - #define PR_CVRS_OPRT_OUT_3 (45) + #define PR_CVRS_OPRT_OUT_3_S "0" + #define PR_CVRS_OPRT_OUT_3 (0) #define TN_CVRS_OPRT_OUT_4 "CVRS_OPRT_OUT_4" - #define PR_CVRS_OPRT_OUT_4_S "45" - #define PR_CVRS_OPRT_OUT_4 (45) + #define PR_CVRS_OPRT_OUT_4_S "0" + #define PR_CVRS_OPRT_OUT_4 (0) #define TN_CVRS_OPRT_IN_1 "CVRS_OPRT_IN_1" - #define PR_CVRS_OPRT_IN_1_S "45" - #define PR_CVRS_OPRT_IN_1 (45) + #define PR_CVRS_OPRT_IN_1_S "0" + #define PR_CVRS_OPRT_IN_1 (0) #define TN_CVRS_OPRT_IN_2 "CVRS_OPRT_IN_2" - #define PR_CVRS_OPRT_IN_2_S "45" - #define PR_CVRS_OPRT_IN_2 (45) + #define PR_CVRS_OPRT_IN_2_S "0" + #define PR_CVRS_OPRT_IN_2 (0) #define TN_CVRS_OPRT_IN_3 "CVRS_OPRT_IN_3" - #define PR_CVRS_OPRT_IN_3_S "45" - #define PR_CVRS_OPRT_IN_3 (45) + #define PR_CVRS_OPRT_IN_3_S "0" + #define PR_CVRS_OPRT_IN_3 (0) #define TN_CVRS_OPRT_IN_4 "CVRS_OPRT_IN_4" - #define PR_CVRS_OPRT_IN_4_S "45" - #define PR_CVRS_OPRT_IN_4 (45) + #define PR_CVRS_OPRT_IN_4_S "0" + #define PR_CVRS_OPRT_IN_4 (0) #define TN_CVRS_OPRT_IN_5 "CVRS_OPRT_IN_5" - #define PR_CVRS_OPRT_IN_5_S "45" - #define PR_CVRS_OPRT_IN_5 (45) + #define PR_CVRS_OPRT_IN_5_S "0" + #define PR_CVRS_OPRT_IN_5 (0) #define TN_CVRS_OPRT_IN_6 "CVRS_OPRT_IN_6" - #define PR_CVRS_OPRT_IN_6_S "45" - #define PR_CVRS_OPRT_IN_6 (45) + #define PR_CVRS_OPRT_IN_6_S "0" + #define PR_CVRS_OPRT_IN_6 (0) #define TN_CVRS_OPRT_IN_7 "CVRS_OPRT_IN_7" - #define PR_CVRS_OPRT_IN_7_S "45" - #define PR_CVRS_OPRT_IN_7 (45) + #define PR_CVRS_OPRT_IN_7_S "0" + #define PR_CVRS_OPRT_IN_7 (0) #define TN_CVRS_OPRT_IN_8 "CVRS_OPRT_IN_8" - #define PR_CVRS_OPRT_IN_8_S "45" - #define PR_CVRS_OPRT_IN_8 (45) + #define PR_CVRS_OPRT_IN_8_S "0" + #define PR_CVRS_OPRT_IN_8 (0) #define TN_CVRS_OPRT_BS_I "CVRS_OPRT_BS_I" - #define PR_CVRS_OPRT_BS_I_S "45" - #define PR_CVRS_OPRT_BS_I (45) + #define PR_CVRS_OPRT_BS_I_S "0" + #define PR_CVRS_OPRT_BS_I (0) #define TN_VR_NVR_RECO "VR_NVR_RECO" - #define PR_VR_NVR_RECO_S "20" - #define PR_VR_NVR_RECO (20) + #define PR_VR_NVR_RECO_S "0" + #define PR_VR_NVR_RECO (0) #define TN_SND_ECNR "SND_ECNR" - #define PR_SND_ECNR_S "40" - #define PR_SND_ECNR (40) + #define PR_SND_ECNR_S "0" + #define PR_SND_ECNR (0) #define TN_SNDAGENT_000 "SNDAGENT_000" - #define PR_SNDAGENT_000_S "45" - #define PR_SNDAGENT_000 (45) + #define PR_SNDAGENT_000_S "0" + #define PR_SNDAGENT_000 (0) #define TN_SNDAGENT_001 "SNDAGENT_001" - #define PR_SNDAGENT_001_S "45" - #define PR_SNDAGENT_001 (45) + #define PR_SNDAGENT_001_S "0" + #define PR_SNDAGENT_001 (0) #define TN_SNDAGENT_002 "SNDAGENT_002" - #define PR_SNDAGENT_002_S "45" - #define PR_SNDAGENT_002 (45) + #define PR_SNDAGENT_002_S "0" + #define PR_SNDAGENT_002 (0) #define TN_SNDAGENT_003 "SNDAGENT_003" - #define PR_SNDAGENT_003_S "45" - #define PR_SNDAGENT_003 (45) + #define PR_SNDAGENT_003_S "0" + #define PR_SNDAGENT_003 (0) #define TN_SNDAGENT_004 "SNDAGENT_004" - #define PR_SNDAGENT_004_S "45" - #define PR_SNDAGENT_004 (45) + #define PR_SNDAGENT_004_S "0" + #define PR_SNDAGENT_004 (0) #define TN_SNDAGENT_005 "SNDAGENT_005" - #define PR_SNDAGENT_005_S "45" - #define PR_SNDAGENT_005 (45) + #define PR_SNDAGENT_005_S "0" + #define PR_SNDAGENT_005 (0) #define TN_SNDAGENT_006 "SNDAGENT_006" - #define PR_SNDAGENT_006_S "45" - #define PR_SNDAGENT_006 (45) + #define PR_SNDAGENT_006_S "0" + #define PR_SNDAGENT_006 (0) #define TN_SNDAGENT_007 "SNDAGENT_007" - #define PR_SNDAGENT_007_S "45" - #define PR_SNDAGENT_007 (45) + #define PR_SNDAGENT_007_S "0" + #define PR_SNDAGENT_007 (0) #define TN_SNDAGENT_008 "SNDAGENT_008" - #define PR_SNDAGENT_008_S "45" - #define PR_SNDAGENT_008 (45) + #define PR_SNDAGENT_008_S "0" + #define PR_SNDAGENT_008 (0) #define TN_SNDAGENT_009 "SNDAGENT_009" - #define PR_SNDAGENT_009_S "45" - #define PR_SNDAGENT_009 (45) + #define PR_SNDAGENT_009_S "0" + #define PR_SNDAGENT_009 (0) #define TN_SNDAGENT_010 "SNDAGENT_010" - #define PR_SNDAGENT_010_S "45" - #define PR_SNDAGENT_010 (45) + #define PR_SNDAGENT_010_S "0" + #define PR_SNDAGENT_010 (0) #define TN_SNDAGENT_011 "SNDAGENT_011" - #define PR_SNDAGENT_011_S "45" - #define PR_SNDAGENT_011 (45) + #define PR_SNDAGENT_011_S "0" + #define PR_SNDAGENT_011 (0) #define TN_SNDAGENT_012 "SNDAGENT_012" - #define PR_SNDAGENT_012_S "45" - #define PR_SNDAGENT_012 (45) + #define PR_SNDAGENT_012_S "0" + #define PR_SNDAGENT_012 (0) #define TN_SNDAGENT_013 "SNDAGENT_013" - #define PR_SNDAGENT_013_S "45" - #define PR_SNDAGENT_013 (45) + #define PR_SNDAGENT_013_S "0" + #define PR_SNDAGENT_013 (0) #define TN_SNDAGENT_014 "SNDAGENT_014" - #define PR_SNDAGENT_014_S "45" - #define PR_SNDAGENT_014 (45) + #define PR_SNDAGENT_014_S "0" + #define PR_SNDAGENT_014 (0) #define TN_SNDAGENT_015 "SNDAGENT_015" - #define PR_SNDAGENT_015_S "45" - #define PR_SNDAGENT_015 (45) + #define PR_SNDAGENT_015_S "0" + #define PR_SNDAGENT_015 (0) #define TN_SNDAGENT_016 "SNDAGENT_016" - #define PR_SNDAGENT_016_S "45" - #define PR_SNDAGENT_016 (45) + #define PR_SNDAGENT_016_S "0" + #define PR_SNDAGENT_016 (0) #define TN_SNDAGENT_017 "SNDAGENT_017" - #define PR_SNDAGENT_017_S "45" - #define PR_SNDAGENT_017 (45) + #define PR_SNDAGENT_017_S "0" + #define PR_SNDAGENT_017 (0) #define TN_SNDAGENT_018 "SNDAGENT_018" - #define PR_SNDAGENT_018_S "45" - #define PR_SNDAGENT_018 (45) + #define PR_SNDAGENT_018_S "0" + #define PR_SNDAGENT_018 (0) #define TN_SNDAGENT_019 "SNDAGENT_019" - #define PR_SNDAGENT_019_S "45" - #define PR_SNDAGENT_019 (45) + #define PR_SNDAGENT_019_S "0" + #define PR_SNDAGENT_019 (0) #define TN_SNDAGENT_020 "SNDAGENT_020" - #define PR_SNDAGENT_020_S "45" - #define PR_SNDAGENT_020 (45) + #define PR_SNDAGENT_020_S "0" + #define PR_SNDAGENT_020 (0) #define TN_SNDAGENT_021 "SNDAGENT_021" - #define PR_SNDAGENT_021_S "45" - #define PR_SNDAGENT_021 (45) + #define PR_SNDAGENT_021_S "0" + #define PR_SNDAGENT_021 (0) #define TN_SNDAGENT_022 "SNDAGENT_022" - #define PR_SNDAGENT_022_S "45" - #define PR_SNDAGENT_022 (45) + #define PR_SNDAGENT_022_S "0" + #define PR_SNDAGENT_022 (0) #define TN_SNDAGENT_023 "SNDAGENT_023" - #define PR_SNDAGENT_023_S "45" - #define PR_SNDAGENT_023 (45) + #define PR_SNDAGENT_023_S "0" + #define PR_SNDAGENT_023 (0) #define TN_SNDAGENT_024 "SNDAGENT_024" - #define PR_SNDAGENT_024_S "45" - #define PR_SNDAGENT_024 (45) + #define PR_SNDAGENT_024_S "0" + #define PR_SNDAGENT_024 (0) #define TN_SNDAGENT_025 "SNDAGENT_025" - #define PR_SNDAGENT_025_S "45" - #define PR_SNDAGENT_025 (45) + #define PR_SNDAGENT_025_S "0" + #define PR_SNDAGENT_025 (0) #define MN_SS_RESOURCEMGR "SS_ResourceMgr" -#define PR_SS_RESOURCEMGR_S "49" -#define PR_SS_RESOURCEMGR (49) +#define PR_SS_RESOURCEMGR_S "0" +#define PR_SS_RESOURCEMGR (0) #define TN_RESOURCEHWDT "ResourceHWDT" - #define PR_RESOURCEHWDT_S "1" - #define PR_RESOURCEHWDT (1) + #define PR_RESOURCEHWDT_S "0" + #define PR_RESOURCEHWDT (0) #define MN_AS_AUDIOMANAGER "AS_AudioManager" #define PR_AS_AUDIOMANAGER_S PR_TSS_S @@ -519,8 +519,8 @@ #define PR_AS_SOUNDBEEP PR_TSS #define MN_GRAPHICS "Graphics" -#define PR_GRAPHICS_S "4" -#define PR_GRAPHICS (4) +#define PR_GRAPHICS_S "0" +#define PR_GRAPHICS (0) #define TN_GR_MAIN_CTRL "Graphics_main" #define PR_GR_MAIN_CTRL_S PR_TSS_S @@ -535,12 +535,12 @@ #define PR_GR_DEV_RCV_CTRL PR_TSS #define TN_GR_VCAP1_CTRL "Graphics_cap1" - #define PR_GR_VCAP1_CTRL_S "4" - #define PR_GR_VCAP1_CTRL (4) + #define PR_GR_VCAP1_CTRL_S "0" + #define PR_GR_VCAP1_CTRL (0) #define TN_GR_VCAP2_CTRL "Graphics_cap2" - #define PR_GR_VCAP2_CTRL_S "4" - #define PR_GR_VCAP2_CTRL (4) + #define PR_GR_VCAP2_CTRL_S "0" + #define PR_GR_VCAP2_CTRL (0) #define MN_VUPSERVICE "vupservice" #define PR_VUPSERVICE_S PR_TSS_S @@ -563,8 +563,8 @@ #define PR_NS_LOCKMGR PR_TSS #define MN_PS_SWITCHHANDLER "SwitchHandler" -#define PR_PS_SWITCHHANDLER_S "30" -#define PR_PS_SWITCHHANDLER (30) +#define PR_PS_SWITCHHANDLER_S "0" +#define PR_PS_SWITCHHANDLER (0) #define MN_SS_WINSYS "SS_WinSys" #define PR_SS_WINSYS_S "5" @@ -709,8 +709,8 @@ #define PR_RADIOSERVICE PR_TSS #define MN_RADIOHDARBITER "RadioHDArbiter" -#define PR_RADIOHDARBITER_S "20" -#define PR_RADIOHDARBITER (20) +#define PR_RADIOHDARBITER_S "0" +#define PR_RADIOHDARBITER (0) #define MN_HRDS_MANAGER "hrds_manager" #define PR_HRDS_MANAGER_S PR_TSS_S @@ -889,8 +889,8 @@ #define PR_HANDWRITING PR_TSS #define MN_EXTUNITAUTH_D "EXTUNITAUTH_D" -#define PR_EXTUNITAUTH_D_S "29" -#define PR_EXTUNITAUTH_D 29 +#define PR_EXTUNITAUTH_D_S "0" +#define PR_EXTUNITAUTH_D 0 #define TN_VPSVC__CWORD84_ "VPSVC_D" #define PR_VPSVC__CWORD84__S PR_TSS_S @@ -945,8 +945,8 @@ #define PR_DASSERVICE PR_TSS #define MN_EXTUNITAUTH_M "EXTUNITAUTH_M" -#define PR_EXTUNITAUTH_M_S "29" -#define PR_EXTUNITAUTH_M 29 +#define PR_EXTUNITAUTH_M_S "0" +#define PR_EXTUNITAUTH_M 0 #define MN_DUMMYREAD "DummyRead" #define PR_DUMMYREAD_S PR_TSS_S diff --git a/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/files/include/agl_types_obsoluted.h b/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/files/include/agl_types_obsoluted.h index 0e427241..0f7e86d8 100644 --- a/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/files/include/agl_types_obsoluted.h +++ b/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/files/include/agl_types_obsoluted.h @@ -125,8 +125,12 @@ typedef uint32_t BOOL; #endif // AGL ASSERT MACRO +#ifdef AGL_ASSERT_ON #define AGL_ASSERT_NOT_TESTED() \ do {fprintf(stderr, "[%s][%s][%s:%d]AGL_ASSERT_NOT_TESTED.\n", \ program_invocation_short_name, __func__, __FILE__, __LINE__);} while(0) - +#else +#define AGL_ASSERT_NOT_TESTED() \ +do {} while(0) +#endif #endif /* _AGL_TYPES_OBSOLUTED_H_ */ diff --git a/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/files/include/sm_launch_conf.h b/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/files/include/sm_launch_conf.h index d444eb0f..d444eb0f 100755..100644 --- a/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/files/include/sm_launch_conf.h +++ b/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/files/include/sm_launch_conf.h diff --git a/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/files/share/agl.mk b/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/files/share/agl.mk index 495614dc..77d4512e 100644 --- a/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/files/share/agl.mk +++ b/meta-agl/meta-agl-basesystem/recipes-core/agl-basefiles/files/share/agl.mk @@ -331,7 +331,7 @@ endif ################################################################################# -RPATH := /usr/lib:/lib:/usr/agl/lib +RPATHLINK := $(SYSROOT)/usr/lib:$(SYSROOT)/lib:$(SYSROOT)/usr/agl/lib ################################################################################# SUBDIRS := $(filter-out mock,$(SUBDIRS)) diff --git a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/agl-systemd_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/agl-systemd_1.0.0.bb index c10c348c..d9482a9d 100644 --- a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/agl-systemd_1.0.0.bb +++ b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/agl-systemd_1.0.0.bb @@ -42,11 +42,7 @@ RDEPENDS_${PN} += " \ bash \ " do_compile[depends] += "agl-basefiles:do_populate_sysroot" -do_compile() { - cd ${WORKDIR}/usr/agl/conf/systemmanager - cpp -P -include ${STAGING_DIR_HOST}/usr/agl/include/sm_launch_conf.h ./sm_launch__CWORD84_.xml ./sm_launch.tmp.xml - ${STAGING_DIR_HOST}/usr/agl/share/launch_xml2cfg.sh ./sm_launch.tmp.xml > ./sm_launch.cfg -} + do_install() { install -d ${D}${systemd_unitdir}/system install -m 644 ${WORKDIR}/setup_refhw.service ${D}/${systemd_unitdir}/system @@ -60,8 +56,6 @@ do_install() { install -d ${D}/usr/target install -m 644 ${WORKDIR}/usr/target/*.lst ${D}/usr/target install -d ${D}/etc/systemd/system - install -d -m 775 ${D}/usr/agl/conf/systemmanager - install -m 644 ${WORKDIR}/usr/agl/conf/systemmanager/sm_launch.cfg ${D}/usr/agl/conf/systemmanager install -d ${D}/lib/udev/rules.d install -m 644 ${WORKDIR}/99-agl.rules ${D}/lib/udev/rules.d install -d -m 777 ${D}/nv/export @@ -76,9 +70,6 @@ sysroot_stage_all_append(){ sysroot_stage_dir ${D}/tool_9E_SI ${SYSROOT_DESTDIR}/tool_9E_SI sysroot_stage_dir ${D}/usr/target ${SYSROOT_DESTDIR}/usr/target sysroot_stage_dir ${D}/usr/agl ${SYSROOT_DESTDIR}/usr/agl - sysroot_stage_dir ${D}/usr/agl/conf/systemmanager ${SYSROOT_DESTDIR}/usr/agl/conf/systemmanager - sysroot_stage_dir ${D}/usr/agl/conf/backup_manager ${SYSROOT_DESTDIR}/usr/agl/conf/backup_manager - sysroot_stage_dir ${D}/nv/npp ${SYSROOT_DESTDIR}/nv/npp - sysroot_stage_dir ${D}/usr/agl/share ${SYSROOT_DESTDIR}/usr/agl/share + sysroot_stage_dir ${D}/nv/BS/ns/npp/rwdata ${SYSROOT_DESTDIR}/nv/BS/ns/npp/rwdata sysroot_stage_dir ${D}/etc/systemd/system/tmp.mount.d ${SYSROOT_DESTDIR}/etc/systemd/system/tmp.mount.d } diff --git a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/setup_refhw.service b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/setup_refhw.service index 10875b28..427dfeda 100644 --- a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/setup_refhw.service +++ b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/setup_refhw.service @@ -1,6 +1,6 @@ [Unit] Description=Initialize Reference Hardware Settings -After=weston.service +#After=weston.service [Service] EnvironmentFile=/tool_9E_SI/env.txt diff --git a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/agl_set_capability.sh b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/agl_set_capability.sh index ac827d04..6b108ae4 100755..100644 --- a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/agl_set_capability.sh +++ b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/agl_set_capability.sh @@ -21,7 +21,7 @@ echo `cat ${CAP_LST}` #----------------------------------------------------------------------- # Capability -df / --exclude-type=nfs > /dev/null +df -T / | grep nfs > /dev/null IS_EMMC_BOOT=$? #*********************from init_nfs_cap.sh************************** @@ -35,7 +35,7 @@ SKIPWARN=n #CAP_LST="/usr/debug/share/target/cap.lst" CAP_LST="/usr/target/agl_cap.lst" -if [ $IS_EMMC_BOOT -ne 0 ]; then +if [ $IS_EMMC_BOOT -eq 0 ]; then if [ -f "${CAP_LST}" ];then echo "*** set capability for NFS environment ***" CAPPATH=/tmp/ diff --git a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/launch_sm.sh b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/launch_sm.sh index ed1e8d12..ed1e8d12 100755..100644 --- a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/launch_sm.sh +++ b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/launch_sm.sh diff --git a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/set_capability.sh b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/set_capability.sh index aa9b78de..c16ab4af 100755..100644 --- a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/set_capability.sh +++ b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/set_capability.sh @@ -21,7 +21,7 @@ echo `cat ${CAP_LST}` #----------------------------------------------------------------------- # Capability -df / --exclude-type=nfs > /dev/null +df -T / | grep nfs > /dev/null IS_EMMC_BOOT=$? #*********************from init_nfs_cap.sh************************** @@ -35,7 +35,7 @@ SKIPWARN=n #CAP_LST="/usr/debug/share/target/cap.lst" CAP_LST="/usr/target/cap.lst" -if [ $IS_EMMC_BOOT -ne 0 ]; then +if [ $IS_EMMC_BOOT -eq 0 ]; then if [ -f "${CAP_LST}" ];then echo "*** set capability for NFS environment ***" CAPPATH=/tmp/ diff --git a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/set_cgroup_rt_runtime_us.sh b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/set_cgroup_rt_runtime_us.sh index 41536f2c..41536f2c 100755..100644 --- a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/set_cgroup_rt_runtime_us.sh +++ b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/set_cgroup_rt_runtime_us.sh diff --git a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/setup_refhw.sh b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/setup_refhw.sh index 1f9501cb..e3f33a40 100755..100644 --- a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/setup_refhw.sh +++ b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/setup_refhw.sh @@ -33,20 +33,20 @@ echo "AREA=$VEHICLEPARAMETERLIBRARY_AREA" >> /tmp/udev_device.env ## For btservice initial data. #chown -R agl:agl /nv/backup/D_BK_CA_BT_MANAGEMENT ## Sprint 29 PFDRECThread -mkdir -p /ramd/log/frameworkunifiedlog/diag -#chmod 777 /ramd/log/frameworkunifiedlog/diag -touch /dev/mmcblk0p9 -chmod 660 /dev/mmcblk0p9 +mkdir -p /ramd/BS/ns/backup_manager/rwdata +mkdir -p /ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/diag +restorecon -R /ramd +#chmod 777 /ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/diag ## Sprint 29 communication #chmod -R 777 /home/root/.app_can_d # TODO:for bluetooth_service #chmod 777 /usr/agl/share -if ! `df / --exclude-type=nfs > /dev/null`; then -cp /sbin/insmod.kmod /tmp/insmod.kmod -ln -s -f /tmp/insmod.kmod /sbin/insmod -setcap cap_sys_module+ep /tmp/insmod.kmod -fi +#if `df -T / | grep nfs > /dev/null`; then +#cp /sbin/insmod.kmod /tmp/insmod.kmod +#ln -s -f /tmp/insmod.kmod /sbin/insmod +#setcap cap_sys_module+ep /tmp/insmod.kmod +#fi ## Sprint 32 Positioning #chmod 777 /dev/ttySC3 diff --git a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/usr/agl/conf/systemmanager/sm_launch.cfg b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/usr/agl/conf/systemmanager/sm_launch.cfg deleted file mode 100644 index 50a18c9a..00000000 --- a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/usr/agl/conf/systemmanager/sm_launch.cfg +++ /dev/null @@ -1,10 +0,0 @@ -# This file is created from ./sm_launch.tmp.xml. -[ModulesLaunchConfig] -Launch1=CoreModules|1|0|False|NS_NPPService|/usr/agl/bin/NS_NPPService|0|True|0|-a SS_SysManager -r output=0x2|NULL|NULL|False|True|20|1000||||||0x0 -Launch2=CoreModules|1|0|False|NS_BackupMgr|/usr/agl/bin/NS_BackupMgr|0|True|0|-l console|NULL|NULL|True|True|15|1000||||||0x0 -Launch3=SS_Logger|2|0|False|SS_LoggerSrv|/usr/agl/bin/SS_LoggerService|0|True|0|-l console -p thrd=pdg.LogQueReader:30,thrd=pdg.TransmitQueReader:30,thrd=pdg.DumpQueReader:11,thrd=pdg.PerformanceQueReader:11,thrd=pdg.LogQueWriter:30,thrd=pdg.TransmitQueWriter:30,thrd=pdg.EvntLogQue:8,thrd=pdg.UdpQueWriter:10|NULL|NULL|True|True|10|1000||||||0x0 -Launch4=ShadowModules|3|0|False|Communication|/usr/agl/bin/communication|0|True|0|-l console|NULL|NULL|True|False|20|1000||||||0x0 -Launch5=VehicleModules|4|0|False|Positioning|/usr/agl/bin/Positioning|0|True|0|NULL|NULL|NULL|True|False|0|1000||||||0x0 -Launch6=SystemModules|5|0|False|SS_PowerService|/usr/agl/bin/SS_PowerService|0|True|0|-l console|NULL|NULL|True|False|0|1000||||||0x0 -Launch7=SystemModules|5|0|False|SS_TaskManager|/usr/agl/bin/tskmgr|0|True|0|-l console|NULL|NULL|True|True|0|1000||||||0x0 -Launch8=SystemModules|5|0|False|SS_ResourceMgr|/usr/agl/bin/resm|0|True|0|-l console|NULL|NULL|True|False|0|1000||||||0x0 diff --git a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/usr/agl/conf/systemmanager/sm_launch__CWORD84_.xml b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/usr/agl/conf/systemmanager/sm_launch__CWORD84_.xml deleted file mode 100755 index 8dd14bb7..00000000 --- a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/usr/agl/conf/systemmanager/sm_launch__CWORD84_.xml +++ /dev/null @@ -1,116 +0,0 @@ -<!-- group_id=1 --> -<group name="CoreModules" wait_time="0" trigger="False" > - <launch - name=MN_NS_NPPSERVICE path="/usr/agl/bin/NS_NPPService" priority=PR_NS_NPPSERVICE_S - critical="True" retry_cnt="0" arguments="-a SS_SysManager -r output=0x2" - restart="NULL" is_start_required="False" - shutdown_critical="True" shutdown_wait_time="20" fast_shutdown_wait_time="1000" - user_name="" - /> - <launch - name=MN_NS_BACKUPMGR path="/usr/agl/bin/NS_BackupMgr" priority=PR_NS_BACKUPMGR_S - critical="True" retry_cnt="0" arguments="-l console" - restart="NULL" is_start_required="True" - shutdown_critical="True" shutdown_wait_time="15" fast_shutdown_wait_time="1000" - user_name="" - /> -</group> -<!-- group_id=2 --> -<group name="SS_Logger" wait_time="0" trigger="False" > - <launch - name=MN_SS_LOGGERSRV path="/usr/agl/bin/SS_LoggerService" priority=PR_SS_LOGGERSRV_S - critical="True" retry_cnt="0" arguments="-l console -p thrd=pdg.LogQueReader:30,thrd=pdg.TransmitQueReader:30,thrd=pdg.DumpQueReader:11,thrd=pdg.PerformanceQueReader:11,thrd=pdg.LogQueWriter:30,thrd=pdg.TransmitQueWriter:30,thrd=pdg.EvntLogQue:8,thrd=pdg.UdpQueWriter:10" - restart="NULL" is_start_required="True" - shutdown_critical="True" shutdown_wait_time="10" fast_shutdown_wait_time="1000" - user_name="" - /> -</group> -<!-- group_id=3 --> -<group name="ShadowModules" wait_time="0" trigger="False" > - <!-- - In order to excute the termination process promptly, the shutdown_wait_time of GROUP4~ sha be a;; set tp 0, - and FrameworkunifiedOnStop shall be issued to the servies of GROUP~ at almost the same time upon termination. - Setting shutdown_wait_time in the COMMUNICATION of GROUP3 makes GROUP3 wait for GROUP4~ to terminate service (wait for FrameworkunifiedOnStop responses) all at once. - The reason for batch wait by GROUP3 is to save the LOG of tge ternubatuib processing at the time of ACC-OFF of services - because the LOG save processing is performed by the GROUP2 termination processing of SS_LoggerService. - --> - <launch - name=MN_COMMUNICATION path="/usr/agl/bin/communication" priority=PR_COMMUNICATION_S - critical="True" retry_cnt="0" arguments="-l console" - restart="NULL" is_start_required="True" - shutdown_critical="False" shutdown_wait_time="20" fast_shutdown_wait_time="1000" - user_name="" - /> -</group> - -<!-- group_id=4 --> -<group name="VehicleModules" wait_time="0" trigger="False" > - <launch - name=MN_POSITIONING path="/usr/agl/bin/Positioning" priority=PR_POSITIONING_S - critical="True" retry_cnt="0" arguments="NULL" - restart="NULL" is_start_required="True" - shutdown_critical="False" shutdown_wait_time="0" fast_shutdown_wait_time="1000" - user_name="" - /> -</group> - -<!-- group_id=5 --> -<group name="SystemModules" wait_time="0" trigger="False" > - <launch - name=MN_SS_POWERSERVICE path="/usr/agl/bin/SS_PowerService" priority=PR_SS_POWERSERVICE_S - critical="True" retry_cnt="0" arguments="-l console" - restart="NULL" is_start_required="True" - shutdown_critical="False" shutdown_wait_time="0" fast_shutdown_wait_time="1000" - user_name="" - /> - <launch - name=MN_SS_TASKMANAGER path="/usr/agl/bin/tskmgr" priority=PR_SS_TASKMANAGER_S - critical="True" retry_cnt="0" arguments="-l console" - restart="NULL" is_start_required="True" - shutdown_critical="True" shutdown_wait_time="0" fast_shutdown_wait_time="1000" - user_name="" - /> - <launch - name=MN_SS_RESOURCEMGR path="/usr/agl/bin/resm" priority=PR_SS_RESOURCEMGR_S - critical="True" retry_cnt="0" arguments="-l console" - restart="NULL" is_start_required="True" - shutdown_critical="False" shutdown_wait_time="0" fast_shutdown_wait_time="1000" - user_name="" - /> -</group> -<!-- group_id=6 --> -<!-- group_id=7 --> -<!-- group_id=8 --> -<!-- group_id=9 --> -<!-- group_id=10 --> -<!-- group_id=11 --> -<!-- group_id=12 --> -<!-- group_id=13 --> -<!-- group_id=14 --> -<!-- group_id=15 --> -<!-- group_id=16 --> -<!-- group_id=17 --> -<!-- group_id=18 --> -<!-- group_id=19 --> -<!-- group_id=20 --> -<!-- group_id=21 --> -<!-- group_id=22 --> -<!-- group_id=23 --> -<!-- group_id=24 --> -<!-- group_id=25 --> -<!-- group_id=26 --> -<!-- group_id=28 --> -<!-- group_id=29 --> -<!-- group_id=30 --> -<!-- group_id=31 --> -<!-- group_id=32 --> -<!-- group_id=33 --> -<!-- group_id=34 --> -<!-- group_id=35 --> -<!-- group_id=36 --> -<!-- group_id=37 --> -<!-- group_id=38 --> -<!-- group_id=39 --> -<!-- group_id=40 --> -<!-- group_id=41 --> -<!-- group_id=42 --> diff --git a/meta-agl/meta-agl-basesystem/recipes-core/kernel-module-evklib/kernel-module-evklib-1.0.0/evk_lib.c b/meta-agl/meta-agl-basesystem/recipes-core/kernel-module-evklib/kernel-module-evklib-1.0.0/evk_lib.c index d5c1718e..d5c1718e 100755..100644 --- a/meta-agl/meta-agl-basesystem/recipes-core/kernel-module-evklib/kernel-module-evklib-1.0.0/evk_lib.c +++ b/meta-agl/meta-agl-basesystem/recipes-core/kernel-module-evklib/kernel-module-evklib-1.0.0/evk_lib.c diff --git a/meta-agl/meta-agl-basesystem/recipes-graphics/ns-backupmanager/ns-backupmanager_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-graphics/ns-backupmanager/ns-backupmanager_1.0.0.bb index 97356da7..4d5d8fba 100644 --- a/meta-agl/meta-agl-basesystem/recipes-graphics/ns-backupmanager/ns-backupmanager_1.0.0.bb +++ b/meta-agl/meta-agl-basesystem/recipes-graphics/ns-backupmanager/ns-backupmanager_1.0.0.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://${S}/${MAKE_DIR}/LICENSE;md5=2ee41112a44fe7014dce33e2 inherit agl-basesystem-common FILES_${PN} += " \ - /usr/agl/conf/backup_manager/* \ /usr/agl/lib/* \ + /usr/agl/conf/BS/ns/backup_manager/rodata/* \ " FILES_${PN}-dev += "/usr/agl/include/*" @@ -20,9 +20,11 @@ S = "${WORKDIR}/git" DEPENDS += " \ libxml2-native \ ns-frameworkunified \ + libnv-hal \ " RDEPENDS_${PN} += " \ ns-frameworkunified \ + libnv-hal \ " EXTRA_MAKEFILE=" -f Makefile.client" EXTRA_OEMAKE += "${EXTRA_MAKEFILE}" diff --git a/meta-agl/meta-agl-basesystem/recipes-graphics/ns-frameworkunified/ns-frameworkunified_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-graphics/ns-frameworkunified/ns-frameworkunified_1.0.0.bb index 104a98a0..aa86edeb 100644 --- a/meta-agl/meta-agl-basesystem/recipes-graphics/ns-frameworkunified/ns-frameworkunified_1.0.0.bb +++ b/meta-agl/meta-agl-basesystem/recipes-graphics/ns-frameworkunified/ns-frameworkunified_1.0.0.bb @@ -8,6 +8,8 @@ inherit agl-basesystem-common FILES_${PN} += " \ /usr/agl/lib/* \ /usr/agl/conf/ns_logger/* \ + /nv/BS/ns/framework_unified/* \ + /usr/agl/conf/BS/ns/framework_unified/rodata/* \ " FILES_${PN}-staticdev += " \ /usr/agl/lib/*.a \ @@ -23,7 +25,6 @@ S = "${WORKDIR}/git" # Common Dependencies DEPENDS += " \ - os-vehicleparameterlibrary \ os-posixbasedos001legacylibrary \ ns-loglibrary \ ns-commonlibrary \ @@ -31,7 +32,6 @@ DEPENDS += " \ boost \ " RDEPENDS_${PN} += " \ - os-vehicleparameterlibrary \ os-posixbasedos001legacylibrary \ ns-loglibrary \ ns-commonlibrary \ diff --git a/meta-agl/meta-agl-basesystem/recipes-graphics/os-vehicleparameterlibrary/os-vehicleparameterlibrary_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-graphics/os-vehicleparameterlibrary/os-vehicleparameterlibrary_1.0.0.bb index c171ea3f..a421bbd5 100644 --- a/meta-agl/meta-agl-basesystem/recipes-graphics/os-vehicleparameterlibrary/os-vehicleparameterlibrary_1.0.0.bb +++ b/meta-agl/meta-agl-basesystem/recipes-graphics/os-vehicleparameterlibrary/os-vehicleparameterlibrary_1.0.0.bb @@ -16,7 +16,13 @@ SRCREV = "${AUTOREV}" PV = "1.0.0+gitr${SRCPV}" S = "${WORKDIR}/git" -DEPENDS += " " +#Added here because they are native recipes, although they are AGLs +DEPENDS += " \ + ns-backupmanager \ +" +RDEPENDS_${PN} += " \ + ns-backupmanager \ +" EXTRA_MAKEFILE=" -f Makefile.client" EXTRA_OEMAKE += "${EXTRA_MAKEFILE}" diff --git a/meta-agl/meta-agl-basesystem/recipes-graphics/ps-communication/ps-communication_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-graphics/ps-communication/ps-communication_1.0.0.bb index 53b81c77..ebe1e052 100644 --- a/meta-agl/meta-agl-basesystem/recipes-graphics/ps-communication/ps-communication_1.0.0.bb +++ b/meta-agl/meta-agl-basesystem/recipes-graphics/ps-communication/ps-communication_1.0.0.bb @@ -17,9 +17,11 @@ S = "${WORKDIR}/git" DEPENDS += " \ ns-frameworkunified \ + ps-communicationsubcpu \ " RDEPENDS_${PN} += " \ ns-frameworkunified \ + ps-communicationsubcpu \ " EXTRA_MAKEFILE=" -f Makefile.client" diff --git a/meta-agl/meta-agl-basesystem/recipes-graphics/ss-config/ss-config_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-graphics/ss-config/ss-config_1.0.0.bb index 6d21db22..bf23fc36 100644 --- a/meta-agl/meta-agl-basesystem/recipes-graphics/ss-config/ss-config_1.0.0.bb +++ b/meta-agl/meta-agl-basesystem/recipes-graphics/ss-config/ss-config_1.0.0.bb @@ -21,6 +21,7 @@ DEPENDS += " \ ss-versionlibrary \ ns-frameworkunified \ ps-communication \ + os-vehicleparameterlibrary \ " RDEPENDS_${PN} += " \ ss-interfaceunified \ @@ -28,6 +29,7 @@ RDEPENDS_${PN} += " \ ns-frameworkunified \ ps-communication \ ss-versionlibrary \ + os-vehicleparameterlibrary \ " EXTRA_MAKEFILE=" -f Makefile.client" EXTRA_OEMAKE += "${EXTRA_MAKEFILE}" diff --git a/meta-agl/meta-agl-basesystem/recipes-graphics/ss-interfaceunified/ss-interfaceunified_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-graphics/ss-interfaceunified/ss-interfaceunified_1.0.0.bb index 28544e1d..2b8b8dc7 100644 --- a/meta-agl/meta-agl-basesystem/recipes-graphics/ss-interfaceunified/ss-interfaceunified_1.0.0.bb +++ b/meta-agl/meta-agl-basesystem/recipes-graphics/ss-interfaceunified/ss-interfaceunified_1.0.0.bb @@ -3,6 +3,8 @@ DESCRIPTION = "ss-interfaceunified to build AGL software" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/${MAKE_DIR}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" +DIRFILES = "" + inherit agl-basesystem-common FILES_${PN} += " \ /usr/agl/lib/* \ @@ -13,6 +15,9 @@ FILES_${PN} += " \ /usr/agl/share/systemmanager/scfg/* \ /usr/agl/conf/systemmanager \ /usr/agl/conf/systemmanager/* \ + /usr/agl/conf/BS/ss/system_manager/rwdata/* \ + /usr/agl/conf/BS/ss/power_service/rodata/* \ + /usr/agl/conf/BS/ss/logger_service/rodata/* \ " FILES_${PN}-dev += "/usr/agl/include/*" diff --git a/meta-agl/meta-agl-basesystem/recipes-graphics/ss-resourcemanager/ss-resourcemanager_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-graphics/ss-resourcemanager/ss-resourcemanager_1.0.0.bb index 073acf71..b4c98e73 100644 --- a/meta-agl/meta-agl-basesystem/recipes-graphics/ss-resourcemanager/ss-resourcemanager_1.0.0.bb +++ b/meta-agl/meta-agl-basesystem/recipes-graphics/ss-resourcemanager/ss-resourcemanager_1.0.0.bb @@ -21,18 +21,18 @@ DEPENDS += " \ ss-interfaceunified \ ns-frameworkunified \ ns-commonlibrary \ - os-vehicleparameterlibrary \ os-rpclibrary \ os-eventlibrary \ + libsoctemperature-hal \ " RDEPENDS_${PN} += " \ ns-frameworkunified \ ss-interfaceunified \ ns-commonlibrary \ ns-frameworkunified \ - os-vehicleparameterlibrary \ os-rpclibrary \ os-eventlibrary \ + libsoctemperature-hal \ " EXTRA_MAKEFILE=" -f Makefile.client" diff --git a/meta-agl/meta-agl-basesystem/recipes-graphics/ss-romaccesslibrary/ss-romaccesslibrary_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-graphics/ss-romaccesslibrary/ss-romaccesslibrary_1.0.0.bb index e6c6ec86..6b45ee81 100644 --- a/meta-agl/meta-agl-basesystem/recipes-graphics/ss-romaccesslibrary/ss-romaccesslibrary_1.0.0.bb +++ b/meta-agl/meta-agl-basesystem/recipes-graphics/ss-romaccesslibrary/ss-romaccesslibrary_1.0.0.bb @@ -17,9 +17,13 @@ S = "${WORKDIR}/git" DEPENDS += " \ ns-frameworkunified \ + ns-commonlibrary \ + ns-memorygpioaccesslibrary \ " RDEPENDS_${PN} += " \ ns-frameworkunified \ + ns-commonlibrary \ + ns-memorygpioaccesslibrary \ " EXTRA_MAKEFILE=" -f Makefile.client" EXTRA_OEMAKE += "${EXTRA_MAKEFILE}" diff --git a/meta-agl/meta-agl-basesystem/recipes-graphics/ss-taskmanager/ss-taskmanager_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-graphics/ss-taskmanager/ss-taskmanager_1.0.0.bb index 55f19523..363e7d48 100644 --- a/meta-agl/meta-agl-basesystem/recipes-graphics/ss-taskmanager/ss-taskmanager_1.0.0.bb +++ b/meta-agl/meta-agl-basesystem/recipes-graphics/ss-taskmanager/ss-taskmanager_1.0.0.bb @@ -7,8 +7,7 @@ inherit agl-basesystem-common FILES_${PN} += " \ /usr/agl/lib/* \ - /usr/agl/conf/tm_launch/* \ - /usr/agl/conf/thread/* \ + /usr/agl/conf/BS/ss/task_manager/rodata/* \ " FILES_${PN}-dev += "/usr/agl/include/*" diff --git a/meta-agl/meta-agl-basesystem/recipes-graphics/vs-positioning/vs-positioning_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-graphics/vs-positioning/vs-positioning_1.0.0.bb index acccd9ac..ed6c5f80 100644 --- a/meta-agl/meta-agl-basesystem/recipes-graphics/vs-positioning/vs-positioning_1.0.0.bb +++ b/meta-agl/meta-agl-basesystem/recipes-graphics/vs-positioning/vs-positioning_1.0.0.bb @@ -22,11 +22,13 @@ DEPENDS += " \ ns-frameworkunified \ os-vehicleparameterlibrary \ vs-positioningbaselibrary \ + libpositioning-hal \ " RDEPENDS_${PN} += " \ ns-frameworkunified \ os-vehicleparameterlibrary \ vs-positioningbaselibrary \ + libpositioning-hal \ " EXTRA_MAKEFILE=" -f Makefile.client" EXTRA_OEMAKE += "${EXTRA_MAKEFILE} -j 1 'CXX=${CXX} -Wl,--warn-unresolved-symbols' 'CC=${CC} -Wl,--warn-unresolved-symbols'" diff --git a/meta-agl/meta-agl-basesystem/recipes-graphics/vs-positioningbaselibrary/vs-positioningbaselibrary_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-graphics/vs-positioningbaselibrary/vs-positioningbaselibrary_1.0.0.bb index a1f1a98e..b168c663 100644 --- a/meta-agl/meta-agl-basesystem/recipes-graphics/vs-positioningbaselibrary/vs-positioningbaselibrary_1.0.0.bb +++ b/meta-agl/meta-agl-basesystem/recipes-graphics/vs-positioningbaselibrary/vs-positioningbaselibrary_1.0.0.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://${S}/${MAKE_DIR}/LICENSE;md5=2ee41112a44fe7014dce33e2 inherit agl-basesystem-common FILES_${PN} += " \ /usr/agl/lib/* \ + /nv/BS/vs/positioning_base_library/* \ " FILES_${PN}-dev += "/usr/agl/include/*" @@ -19,10 +20,12 @@ S = "${WORKDIR}/git" DEPENDS += " \ ns-frameworkunified \ os-eventlibrary \ + os-vehicleparameterlibrary \ " RDEPENDS_${PN} += " \ ns-frameworkunified \ os-eventlibrary \ + os-vehicleparameterlibrary \ " EXTRA_MAKEFILE=" -f Makefile.client" diff --git a/meta-agl/meta-agl-basesystem/recipes-hal/libboot-hal/libboot-hal_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-hal/libboot-hal/libboot-hal_1.0.0.bb new file mode 100644 index 00000000..0aaf69b3 --- /dev/null +++ b/meta-agl/meta-agl-basesystem/recipes-hal/libboot-hal/libboot-hal_1.0.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "libboot_hal for AGL software" +DESCRIPTION = "install libboot_hal to build AGL software" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +inherit agl-basesystem-hal + +FILES_${PN} += " \ +" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/boot_hal" +SRCREV = "${AUTOREV}" + +PV = "1.0.0+gitr${SRCPV}" +S = "${WORKDIR}/git" + +DEPENDS += " ns-frameworkunified" + +HAL_NAME = "boot_hal" diff --git a/meta-agl/meta-agl-basesystem/recipes-hal/libcan-hal/libcan-hal_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-hal/libcan-hal/libcan-hal_1.0.0.bb new file mode 100644 index 00000000..2ff52d24 --- /dev/null +++ b/meta-agl/meta-agl-basesystem/recipes-hal/libcan-hal/libcan-hal_1.0.0.bb @@ -0,0 +1,18 @@ +SUMMARY = "libcan_hal for AGL software" +DESCRIPTION = "install libcan_hal to build AGL software" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +inherit agl-basesystem-hal + +FILES_${PN} += "/usr/agl/include/peripheral_service/*" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/can_hal" +SRCREV = "${AUTOREV}" + +PV = "1.0.0+gitr${SRCPV}" +S = "${WORKDIR}/git" + +DEPENDS += " ns-frameworkunified" + +HAL_NAME = "can_hal" diff --git a/meta-agl/meta-agl-basesystem/recipes-hal/libclock-hal/libclock-hal_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-hal/libclock-hal/libclock-hal_1.0.0.bb new file mode 100644 index 00000000..71abcba8 --- /dev/null +++ b/meta-agl/meta-agl-basesystem/recipes-hal/libclock-hal/libclock-hal_1.0.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "libclock_hal for AGL software" +DESCRIPTION = "install libclock_hal to build AGL software" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +inherit agl-basesystem-hal + +FILES_${PN} += " \ +" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/clock_hal" +SRCREV = "${AUTOREV}" + +PV = "1.0.0+gitr${SRCPV}" +S = "${WORKDIR}/git" + +DEPENDS += " ns-frameworkunified" + +HAL_NAME = "clock_hal" diff --git a/meta-agl/meta-agl-basesystem/recipes-hal/libdeck-hal/libdeck-hal_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-hal/libdeck-hal/libdeck-hal_1.0.0.bb new file mode 100644 index 00000000..b34729df --- /dev/null +++ b/meta-agl/meta-agl-basesystem/recipes-hal/libdeck-hal/libdeck-hal_1.0.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "libdeck_hal for AGL software" +DESCRIPTION = "install libdeck_hal to build AGL software" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +inherit agl-basesystem-hal + +FILES_${PN} += " \ +" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/deck_hal" +SRCREV = "${AUTOREV}" + +PV = "1.0.0+gitr${SRCPV}" +S = "${WORKDIR}/git" + +DEPENDS += " ns-frameworkunified" + +HAL_NAME = "deck_hal" diff --git a/meta-agl/meta-agl-basesystem/recipes-hal/libinput-hal/libinput-hal_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-hal/libinput-hal/libinput-hal_1.0.0.bb new file mode 100644 index 00000000..adc06b37 --- /dev/null +++ b/meta-agl/meta-agl-basesystem/recipes-hal/libinput-hal/libinput-hal_1.0.0.bb @@ -0,0 +1,23 @@ +SUMMARY = "libinput_hal for AGL software" +DESCRIPTION = "install libinput_hal to build AGL software" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +inherit agl-basesystem-hal + +FILES_${PN} += " \ +" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/input_hal" +SRCREV = "${AUTOREV}" + +PV = "1.0.0+gitr${SRCPV}" +S = "${WORKDIR}/git" + +DEPENDS += " \ + ns-frameworkunified\ + drm \ + udev \ +" + +HAL_NAME = "input_hal" diff --git a/meta-agl/meta-agl-basesystem/recipes-hal/libnv-hal/libnv-hal_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-hal/libnv-hal/libnv-hal_1.0.0.bb new file mode 100644 index 00000000..a752696c --- /dev/null +++ b/meta-agl/meta-agl-basesystem/recipes-hal/libnv-hal/libnv-hal_1.0.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "libnv_hal for AGL software" +DESCRIPTION = "install libnv_hal to build AGL software" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +inherit agl-basesystem-hal + +FILES_${PN}-dev += "/usr/agl/include/native_service/* " + +do_package_qa[noexec] = "1" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/nv_hal" +SRCREV = "${AUTOREV}" + +PV = "1.0.0+gitr${SRCPV}" +S = "${WORKDIR}/git" + +DEPENDS += " ns-frameworkunified" + +HAL_NAME = "nv_hal" diff --git a/meta-agl/meta-agl-basesystem/recipes-hal/libpositioning-hal/libpositioning-hal_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-hal/libpositioning-hal/libpositioning-hal_1.0.0.bb new file mode 100644 index 00000000..bb1e34fd --- /dev/null +++ b/meta-agl/meta-agl-basesystem/recipes-hal/libpositioning-hal/libpositioning-hal_1.0.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "libpositioning_hal for AGL software" +DESCRIPTION = "install libpositioning_hal to build AGL software" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +inherit agl-basesystem-hal + +FILES_${PN}-dev += "/usr/agl/include/vehicle_service/*" + +do_package_qa[noexec] = "1" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/positioning_hal" +SRCREV = "${AUTOREV}" + +PV = "1.0.0+gitr${SRCPV}" +S = "${WORKDIR}/git" + +DEPENDS += " \ + ns-frameworkunified \ + ns-backupmanager \ + vs-positioningbaselibrary \ +" + +HAL_NAME = "positioning_hal" diff --git a/meta-agl/meta-agl-basesystem/recipes-hal/libpower-hal/libpower-hal_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-hal/libpower-hal/libpower-hal_1.0.0.bb new file mode 100644 index 00000000..bec6af91 --- /dev/null +++ b/meta-agl/meta-agl-basesystem/recipes-hal/libpower-hal/libpower-hal_1.0.0.bb @@ -0,0 +1,18 @@ +SUMMARY = "libpower_hal for AGL software" +DESCRIPTION = "install libpower_hal to build AGL software" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +inherit agl-basesystem-hal + +FILES_${PN}-dev += "/usr/agl/include/peripheral_service/*" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/power_hal" +SRCREV = "${AUTOREV}" + +PV = "1.0.0+gitr${SRCPV}" +S = "${WORKDIR}/git" + +DEPENDS += " ns-frameworkunified" + +HAL_NAME = "power_hal" diff --git a/meta-agl/meta-agl-basesystem/recipes-hal/libsecurity-hal/libsecurity-hal_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-hal/libsecurity-hal/libsecurity-hal_1.0.0.bb new file mode 100644 index 00000000..0cc9a011 --- /dev/null +++ b/meta-agl/meta-agl-basesystem/recipes-hal/libsecurity-hal/libsecurity-hal_1.0.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "libsecurity_hal for AGL software" +DESCRIPTION = "install libsecurity_hal to build AGL software" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +inherit agl-basesystem-hal + +FILES_${PN}-dev += "/usr/agl/include/system_service/*" + +do_package_qa[noexec] = "1" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/security_hal" +SRCREV = "${AUTOREV}" + +PV = "1.0.0+gitr${SRCPV}" +S = "${WORKDIR}/git" + +DEPENDS += " ns-frameworkunified" + +HAL_NAME = "security_hal" diff --git a/meta-agl/meta-agl-basesystem/recipes-hal/libsoctemperature-hal/libsoctemperature-hal_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-hal/libsoctemperature-hal/libsoctemperature-hal_1.0.0.bb new file mode 100644 index 00000000..6f7f9c31 --- /dev/null +++ b/meta-agl/meta-agl-basesystem/recipes-hal/libsoctemperature-hal/libsoctemperature-hal_1.0.0.bb @@ -0,0 +1,18 @@ +SUMMARY = "libsoc_temperature-hal for AGL software" +DESCRIPTION = "install libsoc_temperature-hal to build AGL software" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +inherit agl-basesystem-hal + +FILES_${PN} += "/usr/agl/include/system_service/*" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/soctemperature_hal" +SRCREV = "${AUTOREV}" + +PV = "1.0.0+gitr${SRCPV}" +S = "${WORKDIR}/git" + +DEPENDS += " ns-frameworkunified" + +HAL_NAME = "soc_temperature_hal" diff --git a/meta-agl/meta-agl-basesystem/recipes-hal/libupdate-hal/libupdate-hal_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-hal/libupdate-hal/libupdate-hal_1.0.0.bb new file mode 100644 index 00000000..10bcf5de --- /dev/null +++ b/meta-agl/meta-agl-basesystem/recipes-hal/libupdate-hal/libupdate-hal_1.0.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "libupdate_hal for AGL software" +DESCRIPTION = "install libupdate_hal to build AGL software" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +inherit agl-basesystem-hal + +FILES_${PN} += " \ + /usr/* \ +" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/update_hal" +SRCREV = "${AUTOREV}" + +PV = "1.0.0+gitr${SRCPV}" +S = "${WORKDIR}/git" + +DEPENDS += " \ +" + +HAL_NAME = "update_hal" diff --git a/meta-agl/meta-agl-basesystem/recipes-hal/libusb-hal/libusb-hal_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-hal/libusb-hal/libusb-hal_1.0.0.bb new file mode 100644 index 00000000..6a50748c --- /dev/null +++ b/meta-agl/meta-agl-basesystem/recipes-hal/libusb-hal/libusb-hal_1.0.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "libusb_hal for AGL software" +DESCRIPTION = "install libusb_hal to build AGL software" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +inherit agl-basesystem-hal + +FILES_${PN} += " \ +" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/usb_hal" +SRCREV = "${AUTOREV}" + +PV = "1.0.0+gitr${SRCPV}" +S = "${WORKDIR}/git" + +DEPENDS += " ns-frameworkunified" + +HAL_NAME = "usb_hal" diff --git a/meta-agl/meta-agl-basesystem/recipes-hal/libvehicle-hal/libvehicle-hal_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-hal/libvehicle-hal/libvehicle-hal_1.0.0.bb new file mode 100644 index 00000000..b47e16fc --- /dev/null +++ b/meta-agl/meta-agl-basesystem/recipes-hal/libvehicle-hal/libvehicle-hal_1.0.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "libvehicle_hal for AGL software" +DESCRIPTION = "install libvehicle_hal to build AGL software" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +inherit agl-basesystem-hal + +FILES_${PN} += " \ +" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/vehicle_hal" +SRCREV = "${AUTOREV}" + +PV = "1.0.0+gitr${SRCPV}" +S = "${WORKDIR}/git" + +DEPENDS += " ns-frameworkunified" + +HAL_NAME = "vehicle_hal" diff --git a/meta-agl/meta-agl-basesystem/recipes-hal/libvideo-in-hal/libvideo-in-hal_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-hal/libvideo-in-hal/libvideo-in-hal_1.0.0.bb new file mode 100644 index 00000000..2ae32812 --- /dev/null +++ b/meta-agl/meta-agl-basesystem/recipes-hal/libvideo-in-hal/libvideo-in-hal_1.0.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "libvideo_in_hal for AGL software" +DESCRIPTION = "install libvideo_in_hal to build AGL software" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +inherit agl-basesystem-hal + +FILES_${PN} += " \ +" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/video_in_hal" +SRCREV = "${AUTOREV}" + +PV = "1.0.0+gitr${SRCPV}" +S = "${WORKDIR}/git" + +DEPENDS += " ns-frameworkunified" + +HAL_NAME = "video_in_hal" diff --git a/meta-agl/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-hal.bb b/meta-agl/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-hal.bb new file mode 100644 index 00000000..c9742c01 --- /dev/null +++ b/meta-agl/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-hal.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "hal Package Groups" +LICENSE = "CLOSED" +PR = "r1" + +DEPENDS_qemux86-64 = "agl-basefiles" +DEPENDS_qemuarm64 = "agl-basefiles" + +# +# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH +# +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-basesystem-hal \ + " +RDEPENDS_${PN} += " \ + libboot-hal \ + libcan-hal \ + libclock-hal \ + libdeck-hal \ + libinput-hal \ + libnv-hal \ + libpositioning-hal \ + libpower-hal \ + libsecurity-hal \ + libsoctemperature-hal \ + libupdate-hal \ + libusb-hal \ + libvehicle-hal \ + libvideo-in-hal \ +" + diff --git a/meta-agl/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem.bb b/meta-agl/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem.bb index 896eb670..305df526 100644 --- a/meta-agl/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem.bb +++ b/meta-agl/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem.bb @@ -21,6 +21,7 @@ RDEPENDS_${PN} += "\ packagegroup-agl-basesystem-core \ packagegroup-agl-basesystem-graphics \ packagegroup-agl-basesystem-service \ + packagegroup-agl-basesystem-hal \ " diff --git a/meta-agl/meta-agl-basesystem/recipes-stub/ns-memorygpioaccesslibrary/ns-memorygpioaccesslibrary_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-stub/ns-memorygpioaccesslibrary/ns-memorygpioaccesslibrary_1.0.0.bb new file mode 100644 index 00000000..0b2abb72 --- /dev/null +++ b/meta-agl/meta-agl-basesystem/recipes-stub/ns-memorygpioaccesslibrary/ns-memorygpioaccesslibrary_1.0.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "ns-memorygpioaccesslibrary for AGL software" +DESCRIPTION = "ns-memorygpioaccesslibrary to build AGL software" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/${MAKE_DIR}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +inherit agl-basesystem-common +FILES_${PN} += " /usr/agl/lib/* " +FILES_${PN}-dev += "/usr/agl/include/*" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/stub" +SRCREV = "${AUTOREV}" + +PV = "1.0.0+gitr${SRCPV}" +S = "${WORKDIR}/git" + +DEPENDS += " " + +MAKE_DIR ="memory_gpio_access_library" + +EXTRA_MAKEFILE = " -f Makefile" +EXTRA_OEMAKE += "${EXTRA_MAKEFILE}" + diff --git a/meta-agl/meta-agl-basesystem/recipes-stub/ps-communicationsubcpu/ps-communicationsubcpu_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-stub/ps-communicationsubcpu/ps-communicationsubcpu_1.0.0.bb new file mode 100644 index 00000000..a92b0aed --- /dev/null +++ b/meta-agl/meta-agl-basesystem/recipes-stub/ps-communicationsubcpu/ps-communicationsubcpu_1.0.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "ps-communicationsubcpu for AGL software" +DESCRIPTION = "ps-communicationsubcpu to build AGL software" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/${MAKE_DIR}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +inherit agl-basesystem-common +FILES_${PN} += " /usr/agl/lib/* " +FILES_${PN}-dev += "/usr/agl/include/*" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/stub" +SRCREV = "${AUTOREV}" + +PV = "1.0.0+gitr${SRCPV}" +S = "${WORKDIR}/git" + +DEPENDS += " ns-frameworkunified" + +MAKE_DIR ="communication_subcpu" + +EXTRA_MAKEFILE = " -f Makefile" +EXTRA_OEMAKE += "${EXTRA_MAKEFILE}" + diff --git a/meta-agl/meta-agl-basesystem/recipes-stub/ps-communicationusb/ps-communicationusb_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-stub/ps-communicationusb/ps-communicationusb_1.0.0.bb new file mode 100644 index 00000000..81e7a712 --- /dev/null +++ b/meta-agl/meta-agl-basesystem/recipes-stub/ps-communicationusb/ps-communicationusb_1.0.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "ps-communicationusb for AGL software" +DESCRIPTION = "ps-communicationusb to build AGL software" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/${MAKE_DIR}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +inherit agl-basesystem-common +FILES_${PN} += " /usr/agl/lib/* " +FILES_${PN}-dev += "/usr/agl/include/*" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/stub" +SRCREV = "${AUTOREV}" + +PV = "1.0.0+gitr${SRCPV}" +S = "${WORKDIR}/git" + +DEPENDS += " ns-frameworkunified" + +MAKE_DIR = "communication_usb" + +EXTRA_MAKEFILE = " -f Makefile" +EXTRA_OEMAKE += "${EXTRA_MAKEFILE}" + diff --git a/meta-agl/meta-agl-basesystem/recipes-stub/vs-clock/vs-clock_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-stub/vs-clock/vs-clock_1.0.0.bb new file mode 100644 index 00000000..60d5af82 --- /dev/null +++ b/meta-agl/meta-agl-basesystem/recipes-stub/vs-clock/vs-clock_1.0.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "vs-clock for AGL software" +DESCRIPTION = "vs-clock to build AGL software" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/${MAKE_DIR}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +inherit agl-basesystem-common +FILES_${PN} += " /usr/agl/lib/* " +FILES_${PN}-dev += "/usr/agl/include/*" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/stub" +SRCREV = "${AUTOREV}" + +PV = "1.0.0+gitr${SRCPV}" +S = "${WORKDIR}/git" + +DEPENDS += " ns-frameworkunified" + +MAKE_DIR ="clock" + +EXTRA_MAKEFILE = " -f Makefile.client" +EXTRA_OEMAKE += "${EXTRA_MAKEFILE}" + diff --git a/meta-agl/meta-agl-basesystem/recipes-stub/vs-diagcode/vs-diagcode_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-stub/vs-diagcode/vs-diagcode_1.0.0.bb new file mode 100644 index 00000000..2b7ca917 --- /dev/null +++ b/meta-agl/meta-agl-basesystem/recipes-stub/vs-diagcode/vs-diagcode_1.0.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "vs-diagcode for AGL software" +DESCRIPTION = "vs-diagcode to build AGL software" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/${MAKE_DIR}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +inherit agl-basesystem-common +FILES_${PN} += " /usr/agl/lib/* " +FILES_${PN}-dev += "/usr/agl/include/*" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/stub" +SRCREV = "${AUTOREV}" + +PV = "1.0.0+gitr${SRCPV}" +S = "${WORKDIR}/git" + +# Common Dependencies +DEPENDS += " ns-frameworkunified" + +# Build directory +MAKE_DIR ="diag_code" + +EXTRA_MAKEFILE = " -f Makefile" +EXTRA_OEMAKE += "${EXTRA_MAKEFILE}" + diff --git a/meta-agl/meta-agl-basesystem/recipes-stub/vs-diagrecord/vs-diagrecord_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-stub/vs-diagrecord/vs-diagrecord_1.0.0.bb new file mode 100644 index 00000000..010b2d05 --- /dev/null +++ b/meta-agl/meta-agl-basesystem/recipes-stub/vs-diagrecord/vs-diagrecord_1.0.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "vs-diagrecord for AGL software" +DESCRIPTION = "vs-diagrecord to build AGL software" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/${MAKE_DIR}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +inherit agl-basesystem-common +FILES_${PN} += " /usr/agl/lib/* " +FILES_${PN}-dev += "/usr/agl/include/*" + +FILES_${PN}-staticdev = "/usr/agl/lib/*.a" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/stub" +SRCREV = "${AUTOREV}" + +PV = "1.0.0+gitr${SRCPV}" +S = "${WORKDIR}/git" + +DEPENDS += " ns-frameworkunified" + +MAKE_DIR ="diag_record" + +EXTRA_MAKEFILE = " -f Makefile" +EXTRA_OEMAKE += "${EXTRA_MAKEFILE}" + diff --git a/meta-agl/meta-agl-basesystem/recipes-stub/vs-vehicle/vs-vehicle_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-stub/vs-vehicle/vs-vehicle_1.0.0.bb new file mode 100644 index 00000000..7668f96a --- /dev/null +++ b/meta-agl/meta-agl-basesystem/recipes-stub/vs-vehicle/vs-vehicle_1.0.0.bb @@ -0,0 +1,28 @@ +SUMMARY = "vs-vehicle for AGL software" +DESCRIPTION = "vs-vehicle to build AGL software" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/${MAKE_DIR}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +inherit agl-basesystem-common + +FILES_${PN} += " \ + /usr/agl/lib/* \ +" +FILES_${PN}-staticdev += " \ + /usr/agl/lib/*.a \ +" +FILES_${PN}-dev += "/usr/agl/include/*" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/stub" +SRCREV = "${AUTOREV}" + +PV = "1.0.0+gitr${SRCPV}" +S = "${WORKDIR}/git" + +DEPENDS += " ps-communication" + +MAKE_DIR ="vehicle" + +EXTRA_MAKEFILE = " -f Makefile" +EXTRA_OEMAKE += "${EXTRA_MAKEFILE}" + diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_bbe.inc b/meta-agl/meta-agl-bsp/conf/include/agl_bbe.inc index 4f4dc986..5dc81709 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_bbe.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_bbe.inc @@ -8,7 +8,7 @@ CORE_IMAGE_EXTRA_INSTALL += "packagegroup-machine-base" #------------------------------------------------- ## Graphics section ## #------------------------------------------------- -PACKAGES_GFX = "omapdrm-pvr" +PACKAGES_GFX = "ti-sgx-ddk-km" IMAGE_INSTALL_append = " ${PACKAGES_GFX}" @@ -22,11 +22,8 @@ DEPENDS_remove = "virtual/libgl" PREFERRED_PROVIDER_virtual/libgles1 = "" PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um" PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um" PREFERRED_PROVIDER_virtual/mesa = "mesa-gl" -PREFERRED_PROVIDER_libgbm = "libgbm" - -#Preferred versions -PREFERRED_VERSION_libgbm = "10.0.0" #------------------------------------------------- ## Multimedia section ## diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_beaglebone.inc b/meta-agl/meta-agl-bsp/conf/include/agl_beaglebone.inc index 988b3d53..1917ff45 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_beaglebone.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_beaglebone.inc @@ -3,7 +3,7 @@ #------------------------------------------------- ## Graphics section ## #------------------------------------------------- -PACKAGES_GFX = "omapdrm-pvr" +PACKAGES_GFX = "ti-sgx-ddk-km" IMAGE_INSTALL_append = " ${PACKAGES_GFX}" @@ -17,11 +17,8 @@ DEPENDS_remove = "virtual/libgl" PREFERRED_PROVIDER_virtual/libgles1 = "" PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um" PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um" PREFERRED_PROVIDER_virtual/mesa = "mesa-gl" -PREFERRED_PROVIDER_libgbm = "libgbm" - -#Preferred versions -PREFERRED_VERSION_libgbm = "10.0.0" #------------------------------------------------- ## Multimedia section ## diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc b/meta-agl/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc index 54524a81..2e7741a5 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc @@ -2,7 +2,7 @@ #------------------------------------------------- ## Graphics section ## #------------------------------------------------- -PACKAGES_GFX_${MACHINE} = "omapdrm-pvr" +PACKAGES_GFX_${MACHINE} = "ti-sgx-ddk-km" # Enable Gfx Pkgs MACHINE_FEATURES_append = " sgx" @@ -14,11 +14,8 @@ DEPENDS_remove = "virtual/libgl" PREFERRED_PROVIDER_virtual/libgles1 = "" PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um" PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um" PREFERRED_PROVIDER_virtual/mesa = "mesa-gl" -PREFERRED_PROVIDER_libgbm = "libgbm" - -#Preferred versions -PREFERRED_VERSION_libgbm = "10.0.0" #------------------------------------------------- ## Multimedia section ## diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc b/meta-agl/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc index 39ed6688..68398371 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc @@ -5,7 +5,7 @@ IMAGE_INSTALL_append = " \ intel-vaapi-driver \ gstreamer1.0-vaapi" -AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum" +AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum ext4 wic.vmdk" INITRD_LIVE = "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.ext4.gz" # Modify this file under meta-agl-bsp/meta-intel/wic to change the @@ -16,3 +16,17 @@ PREFERRED_VERSION_linux-intel ?= "4.19%" PREFERRED_VERSION_linux-intel-rt ?= "4.19%" SERIAL_CONSOLES_remove = "115200;ttyS2" + +# +# To avoid corrupt boot screen by systemd message, you can use serial +# console separated from VGA console or disable all boot messages by +# kernel command line. +# +# Configuration for serial console +QB_KERNEL_CMDLINE_APPEND_append = " console=ttyS0,115200n8" +# +# All boot message will be off +QB_KERNEL_CMDLINE_APPEND_append = " quiet" +# +# Force the virtio video device as 'vmware' doesn't always work +QB_OPT_APPEND_append = " -vga virtio" diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_qemux86-64.inc b/meta-agl/meta-agl-bsp/conf/include/agl_qemux86-64.inc index a72f7b0f..11295c7e 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_qemux86-64.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_qemux86-64.inc @@ -21,7 +21,7 @@ QB_KERNEL_CMDLINE_APPEND_append = " quiet" DISTRO_FEATURES_append = " sota" # Image support -AGL_EXTRA_IMAGE_FSTYPES = "ext4 wic.vmdk" +AGL_EXTRA_IMAGE_FSTYPES = "ext4 wic.vmdk wic.xz wic.bmap" IMAGE_BOOT_FILES_sota = "u-boot-qemux86-64.rom" # Root device @@ -31,4 +31,4 @@ ROOT_VM = "root=PARTUUID=${DISK_SIGNATURE}-02" QB_OPT_APPEND_append = " -vga virtio" # Use our own wks file -WKS_FILE="directdisk.wks.in" +WKS_FILE="systemd-intel-corei7-64-bootdisk.wks" diff --git a/meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc b/meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc index cc307485..94dc5ace 100644 --- a/meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc +++ b/meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc @@ -14,8 +14,19 @@ UBOOT_MACHINE = "rpi_3_32b_config" KERNEL_IMAGETYPE = "uImage" +PREFERRED_VERSION_linux-raspberrypi = "4.19%" +RPI_KERNEL_DEVICETREE_remove_raspberrypi3 = "bcm2708-rpi-0-w.dtb" +RPI_KERNEL_DEVICETREE_OVERLAYS_remove_raspberrypi3 = "overlays/lirc-rpi.dtbo" +RPI_KERNEL_DEVICETREE_OVERLAYS_append_raspberrypi3 = " overlays/vc4-fkms-v3d.dtbo" + +# Set appropriate version of Mesa for Raspberry Pi 3 and 4 +PREFERRED_VERSION_mesa = "19.1%" + MACHINE_FEATURES += "vc4graphics" +# Switch to firmware KMS to support the official DSI touchscreen display +VC4DTBO = "vc4-fkms-v3d" + # For libomxil #LICENSE_FLAGS_WHITELIST = "commercial" diff --git a/meta-agl/meta-agl-bsp/conf/machine/include/rpi4-base.inc b/meta-agl/meta-agl-bsp/conf/machine/include/rpi4-base.inc new file mode 100644 index 00000000..a19d0f88 --- /dev/null +++ b/meta-agl/meta-agl-bsp/conf/machine/include/rpi4-base.inc @@ -0,0 +1,125 @@ +include conf/machine/include/rpi-default-settings.inc +include conf/machine/include/rpi-default-versions.inc +include conf/machine/include/rpi-default-providers.inc + +SOC_FAMILY = "rpi" +include conf/machine/include/soc-family.inc + +IMAGE_FSTYPES ?= "tar.bz2 ext3 rpi-sdimg" +WKS_FILE ?= "sdimage-raspberrypi.wks" + +XSERVER = " \ + xserver-xorg \ + ${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "xserver-xorg-extension-glx", "", d)} \ + ${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "xf86-video-modesetting", "xf86-video-fbdev", d)} \ + " + +RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ + overlays/at86rf233.dtbo \ + overlays/dwc2.dtbo \ + overlays/gpio-key.dtbo \ + overlays/hifiberry-amp.dtbo \ + overlays/hifiberry-dac.dtbo \ + overlays/hifiberry-dacplus.dtbo \ + overlays/hifiberry-digi.dtbo \ + overlays/i2c-rtc.dtbo \ + overlays/iqaudio-dac.dtbo \ + overlays/iqaudio-dacplus.dtbo \ + overlays/mcp2515-can0.dtbo \ + overlays/pi3-disable-bt.dtbo \ + overlays/pi3-miniuart-bt.dtbo \ + overlays/pitft22.dtbo \ + overlays/pitft28-resistive.dtbo \ + overlays/pitft35-resistive.dtbo \ + overlays/pps-gpio.dtbo \ + overlays/rpi-ft5406.dtbo \ + overlays/rpi-poe.dtbo \ + overlays/vc4-kms-v3d.dtbo \ + overlays/vc4-fkms-v3d.dtbo \ + overlays/w1-gpio-pullup.dtbo \ + overlays/w1-gpio.dtbo \ + " + +RPI_KERNEL_DEVICETREE ?= " \ + bcm2708-rpi-zero-w.dtb \ + bcm2708-rpi-b.dtb \ + bcm2708-rpi-b-plus.dtb \ + bcm2709-rpi-2-b.dtb \ + bcm2710-rpi-3-b.dtb \ + bcm2710-rpi-3-b-plus.dtb \ + bcm2711-rpi-4-b.dtb \ + bcm2708-rpi-cm.dtb \ + bcm2710-rpi-cm3.dtb \ + " + +KERNEL_DEVICETREE ?= " \ + ${RPI_KERNEL_DEVICETREE} \ + ${RPI_KERNEL_DEVICETREE_OVERLAYS} \ + " + +# Different dtb and dtbo files are needed for Raspberry Pi 4 +# (64-bit) if feature agl-sota is enabled. +KERNEL_DEVICETREE_raspberrypi4_sota = " broadcom/bcm2711-rpi-4-b.dtb overlays/vc4-fkms-v3d.dtbo overlays/uart0-rpi4.dtbo" + +# By default: +# +# * When u-boot is disabled use the "Image" format which can be directly loaded +# by the rpi firmware. +# +# * When u-boot is enabled use the "uImage" format and the "bootm" command +# within u-boot to load the kernel. +KERNEL_BOOTCMD ??= "bootm" +KERNEL_IMAGETYPE_UBOOT ??= "uImage" +KERNEL_IMAGETYPE_DIRECT ??= "zImage" +KERNEL_IMAGETYPE ?= "${@bb.utils.contains('RPI_USE_U_BOOT', '1', \ + '${KERNEL_IMAGETYPE_UBOOT}', '${KERNEL_IMAGETYPE_DIRECT}', d)}" + +MACHINE_FEATURES += "apm usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio ${@bb.utils.contains('DISABLE_VC4GRAPHICS', '1', '', 'vc4graphics', d)}" + +# Raspberry Pi has no hardware clock +MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc" + +MACHINE_EXTRA_RRECOMMENDS += " kernel-modules udev-rules-rpi" + +# Set Raspberrypi splash image +SPLASH = "psplash-raspberrypi" + +def make_dtb_boot_files(d): + # Generate IMAGE_BOOT_FILES entries for device tree files listed in + # KERNEL_DEVICETREE. + alldtbs = d.getVar('KERNEL_DEVICETREE') + imgtyp = d.getVar('KERNEL_IMAGETYPE') + + def transform(dtb): + base = os.path.basename(dtb) + if dtb.endswith('dtb'): + # eg: whatever/bcm2708-rpi-b.dtb has: + # DEPLOYDIR file: bcm2708-rpi-b.dtb + # destination: bcm2708-rpi-b.dtb + return base + elif dtb.endswith('dtbo'): + # overlay dtb: + # eg: overlays/hifiberry-amp.dtbo has: + # DEPLOYDIR file: hifiberry-amp.dtbo + # destination: overlays/hifiberry-amp.dtbo + return '{};{}'.format(base, dtb) + + return ' '.join([transform(dtb) for dtb in alldtbs.split(' ') if dtb]) + + +IMAGE_BOOT_FILES ?= "bcm2835-bootfiles/* \ + ${@make_dtb_boot_files(d)} \ + ${@bb.utils.contains('RPI_USE_U_BOOT', '1', \ + '${KERNEL_IMAGETYPE} u-boot.bin;${SDIMG_KERNELIMAGE} boot.scr', \ + '${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \ + " +do_image_wic[depends] += " \ + bcm2835-bootfiles:do_deploy \ + ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot:do_deploy', '',d)} \ + " + +do_image_wic[recrdeps] = "do_build" + +# The kernel image is installed into the FAT32 boot partition and does not need +# to also be installed into the rootfs. +RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" diff --git a/meta-agl/meta-agl-bsp/conf/machine/raspberrypi4.conf b/meta-agl/meta-agl-bsp/conf/machine/raspberrypi4.conf index 2f759286..a09d881d 100644 --- a/meta-agl/meta-agl-bsp/conf/machine/raspberrypi4.conf +++ b/meta-agl/meta-agl-bsp/conf/machine/raspberrypi4.conf @@ -1,10 +1,8 @@ #@TYPE: Machine -#@NAME: RaspberryPi 4 Development Board (32bit) -#@DESCRIPTION: Machine configuration for the RaspberryPi 4 in 32 bit mode +#@NAME: RaspberryPi 4 Development Board (64bit) +#@DESCRIPTION: Machine configuration for the RaspberryPi 4 in 64 bits mode -DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4" -require conf/machine/include/tune-cortexa7.inc -include conf/machine/include/rpi-base.inc +MACHINEOVERRIDES = "raspberrypi4:${MACHINE}" MACHINE_EXTRA_RRECOMMENDS += "\ linux-firmware-rpidistro-bcm43455 \ @@ -12,15 +10,28 @@ MACHINE_EXTRA_RRECOMMENDS += "\ pi-bluetooth \ " -# 'l' stands for LPAE -SDIMG_KERNELIMAGE ?= "kernel7l.img" -UBOOT_MACHINE = "rpi_4_32b_config" +require conf/machine/include/arm/arch-arm64.inc +include conf/machine/include/rpi4-base.inc + +RPI_KERNEL_DEVICETREE = " \ + broadcom/bcm2711-rpi-4-b.dtb \ +" + +SDIMG_KERNELIMAGE ?= "kernel8.img" SERIAL_CONSOLES ?= "115200;ttyS0" MACHINE_FEATURES_append = " vc4graphics" +UBOOT_MACHINE = "rpi_4_config" + VC4DTBO ?= "vc4-fkms-v3d" -RPI_KERNEL_DEVICETREE_OVERLAYS_remove_raspberrypi4 = "overlays/lirc-rpi.dtbo" -RPI_KERNEL_DEVICETREE_OVERLAYS_append_raspberrypi4 = " overlays/mcp2515-can0.dtbo overlays/vc4-fkms-v3d.dtbo" -RPI_KERNEL_DEVICETREE_remove_raspberrypi4 = "bcm2708-rpi-0-w.dtb" -RPI_KERNEL_DEVICETREE_append_raspberrypi4 = " bcm2708-rpi-zero-w.dtb bcm2711-rpi-4-b.dtb" +# When u-boot is enabled we need to use the "Image" format and the "booti" +# command to load the kernel +KERNEL_IMAGETYPE_UBOOT ?= "Image" +# "zImage" not supported on arm64 and ".gz" images not supported by bootloader yet +KERNEL_IMAGETYPE_DIRECT ?= "Image" +KERNEL_BOOTCMD ?= "booti" + +RPI_EXTRA_CONFIG ?= "\n# Force arm in 64bit mode. See: https://github.com/raspberrypi/firmware/issues/1193.\narm_64bit=1" + +ARMSTUB ?= "armstub8-gic.bin" diff --git a/meta-agl/meta-agl-bsp/meta-aglprofilegraphical/recipes-graphics/mesa/mesa_%.bbappend b/meta-agl/meta-agl-bsp/meta-aglprofilegraphical/recipes-graphics/mesa/mesa_%.bbappend index 49e52770..8ac343aa 100644 --- a/meta-agl/meta-agl-bsp/meta-aglprofilegraphical/recipes-graphics/mesa/mesa_%.bbappend +++ b/meta-agl/meta-agl-bsp/meta-aglprofilegraphical/recipes-graphics/mesa/mesa_%.bbappend @@ -2,5 +2,6 @@ GALLIUM_LLVM = "gallium-llvm" PACKAGECONFIG_append_qemux86 = " gallium ${GALLIUM_LLVM}" PACKAGECONFIG_append_qemux86-64 = " gallium ${GALLIUM_LLVM}" +PACKAGECONFIG_append_intel-corei7-64 = " gallium ${GALLIUM_LLVM}" DRIDRIVERS_append_intel-corei7-64 = ",i965" diff --git a/meta-agl/meta-agl-bsp/meta-aglprofilegraphical/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl/meta-agl-bsp/meta-aglprofilegraphical/recipes-graphics/wayland/weston-ini-conf.bbappend index 8fa08bc3..4a2dc80a 100644 --- a/meta-agl/meta-agl-bsp/meta-aglprofilegraphical/recipes-graphics/wayland/weston-ini-conf.bbappend +++ b/meta-agl/meta-agl-bsp/meta-aglprofilegraphical/recipes-graphics/wayland/weston-ini-conf.bbappend @@ -1,9 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -# OVERRIDES save us some c'n'p below ... -OVERRIDES_prepend_qemux86 = "virtualmachine:" -OVERRIDES_prepend_qemux86-64 = "virtualmachine:" - -# Switch to the Virtual section that we have when a valid DRM device is found -SRC_URI_remove_virtualmachine = "file://hdmi-a-1-270.cfg" -SRC_URI_append_virtualmachine = " file://virtual.cfg" +# For virtual machines and intel-corei7-64 we want to support both the HDMI-A-1 +# and Virtual-1 outputs. This allows us to run virtual images on real hardware +# and vice versa. +SRC_URI_append_qemuall = " file://virtual.cfg" +SRC_URI_append_intel-corei7-64 = " file://virtual.cfg" diff --git a/meta-agl/meta-agl-bsp/meta-intel/recipes-kernel/linux/files/extra-graphic-devices.cfg b/meta-agl/meta-agl-bsp/meta-intel/recipes-kernel/linux/files/extra-graphic-devices.cfg index 125406ea..d2b64de6 100644 --- a/meta-agl/meta-agl-bsp/meta-intel/recipes-kernel/linux/files/extra-graphic-devices.cfg +++ b/meta-agl/meta-agl-bsp/meta-intel/recipes-kernel/linux/files/extra-graphic-devices.cfg @@ -6,7 +6,6 @@ CONFIG_RSI_SDIO=m CONFIG_RSI_USB=m CONFIG_DRM_RADEON=m CONFIG_DRM_RADEON_USERPTR=y -# CONFIG_DRM_RADEON_UMS is not set CONFIG_DRM_NOUVEAU=m CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 @@ -20,25 +19,14 @@ CONFIG_DRM_GMA3600=y CONFIG_DRM_UDL=m CONFIG_FB_DEFERRED_IO=y CONFIG_FB_BACKLIGHT=y -# CONFIG_LEDS_DELL_NETBOOKS is not set CONFIG_IRQ_BYPASS_MANAGER=m -# CONFIG_ACER_WMI is not set -# CONFIG_ALIENWARE_WMI is not set -# CONFIG_DELL_WMI is not set -# CONFIG_DELL_WMI_AIO is not set -# CONFIG_HP_WMI is not set -# CONFIG_ASUS_WMI is not set CONFIG_ACPI_WMI=m -# CONFIG_MSI_WMI is not set -# CONFIG_ACPI_TOSHIBA is not set -# CONFIG_TOSHIBA_WMI is not set CONFIG_MXM_WMI=m CONFIG_SCHED_INFO=y CONFIG_HAVE_KVM_IRQCHIP=y CONFIG_HAVE_KVM_IRQFD=y CONFIG_HAVE_KVM_IRQ_ROUTING=y CONFIG_HAVE_KVM_EVENTFD=y -CONFIG_KVM_APIC_ARCHITECTURE=y CONFIG_KVM_MMIO=y CONFIG_KVM_ASYNC_PF=y CONFIG_HAVE_KVM_MSI=y @@ -49,6 +37,4 @@ CONFIG_KVM_COMPAT=y CONFIG_HAVE_KVM_IRQ_BYPASS=y CONFIG_KVM=m CONFIG_KVM_INTEL=m -# CONFIG_KVM_AMD is not set -# CONFIG_KVM_MMU_AUDIT is not set CONFIG_CRC7=m diff --git a/meta-agl/meta-agl-bsp/meta-intel/recipes-kernel/linux/files/usb-devices.cfg b/meta-agl/meta-agl-bsp/meta-intel/recipes-kernel/linux/files/usb-devices.cfg index b65e55b0..19c57796 100644 --- a/meta-agl/meta-agl-bsp/meta-intel/recipes-kernel/linux/files/usb-devices.cfg +++ b/meta-agl/meta-agl-bsp/meta-intel/recipes-kernel/linux/files/usb-devices.cfg @@ -1,5 +1,6 @@ CONFIG_BT_QCA=m CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIUART_ATH3K=y CONFIG_BT_HCIUART_LL=y @@ -65,7 +66,7 @@ CONFIG_LIBERTAS_SPI=m # CONFIG_LIBERTAS_MESH is not set CONFIG_RTL8XXXU=m CONFIG_RTL8XXXU_UNTESTED=y -CONFIG_WL_TI=y +CONFIG_WLAN_VENDOR_TI=y CONFIG_WL1251=m # CONFIG_WL1251_SPI is not set # CONFIG_WL1251_SDIO is not set diff --git a/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/bcm2835-bootfiles.bbappend b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/bcm2835-bootfiles.bbappend index 009c448b..fc1ba88c 100644 --- a/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/bcm2835-bootfiles.bbappend +++ b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/bcm2835-bootfiles.bbappend @@ -1,12 +1,12 @@ RDEPENDS_${PN}_append_sota += " u-boot-otascript" -RPIFW_DATE_raspberrypi4 = "20190709" -SRCREV_raspberrypi4 = "356f5c2880a3c7e8774025aa6fc934a617553e7b" -RPIFW_SRC_URI_raspberrypi4 = "https://github.com/raspberrypi/firmware/archive/${SRCREV}.tar.gz" -RPIFW_S_raspberrypi_4 = "${WORKDIR}/firmware-${SRCREV}" +RPIFW_DATE = "20191021" +SRCREV = "ed238d3329e39a68bde03bbc2dfc293c0c3dc93a" +RPIFW_SRC_URI = "https://github.com/raspberrypi/firmware/archive/${SRCREV}.tar.gz" +RPIFW_S = "${WORKDIR}/firmware-${SRCREV}" -SRC_URI_raspberrypi4 = "${RPIFW_SRC_URI}" -SRC_URI[md5sum] = "${@ '5962784e7963f0116cd1519e47749b25' if d.getVar('MACHINE_ARCH') == 'raspberrypi4' else '5ccdb5447cbdd3ee0158a514f7b76cb9'}" -SRC_URI[sha256sum] = "${@ '6e07d98e4229ba7a1970a4c475fc6b8631823d200d3b8734a508e7ff5ea4c120' if d.getVar('MACHINE_ARCH') == 'raspberrypi4' else '9a34ccc4a51695a33206cc6c8534f615ba5a30fcbce5fa3add400ecc6b80ad8a'}" +SRC_URI = "${RPIFW_SRC_URI}" +SRC_URI[md5sum] = "d18066531018a972ed927a6cc136cfff" +SRC_URI[sha256sum] = "82048cf88f4f50f7cf83e34d93923ceb5147885761d33ee5f4dc980b4a7a426a" -PV_raspberrypi4 = "${RPIFW_DATE}" +PV = "${RPIFW_DATE}" diff --git a/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend index 5c74cae7..5eecff6f 100644 --- a/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend +++ b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend @@ -35,6 +35,11 @@ do_deploy_append() { echo "dtparam=audio=on" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt } +do_deploy_append_raspberrypi4() { + echo -e "\n[pi4]" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt + echo "max_framebuffers=2" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt +} + do_deploy_append_sota() { echo "device_tree_address=0x0c800000" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt } diff --git a/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0001-configs-rpi4-Add-defconfigs-for-rpi4-32-64.patch b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0001-configs-rpi4-Add-defconfigs-for-rpi4-32-64.patch new file mode 100644 index 00000000..391b26a1 --- /dev/null +++ b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0001-configs-rpi4-Add-defconfigs-for-rpi4-32-64.patch @@ -0,0 +1,104 @@ +From 5bf85d04b440ce874310e701abded823dc1864bc Mon Sep 17 00:00:00 2001 +From: Andrei Gherzan <andrei@balena.io> +Date: Wed, 17 Jul 2019 15:32:11 +0100 +Subject: [PATCH 1/7] configs: rpi4: Add defconfigs for rpi4 (32/64) + +This defines a minimum defconfig for each of the two Raspberry Pi 4 +variants. One notable difference is that we don't have a embedded dt for +this board given that the fw supplies us with one which we can reuse. +Furthermore, the ram size is not queryable through mbox interface as the +maximum reported size is 1G. The fw patches the dt with the right +memory configuration and uboot uses it as it is. We avoid u-boot +touching this configuration by making sure CONFIG_ARCH_FIXUP_FDT_MEMORY +is deactivated. + +Signed-off-by: Andrei Gherzan <andrei@balena.io> +Upstream-status: Pending +--- + configs/rpi_4_32b_defconfig | 33 +++++++++++++++++++++++++++++++++ + configs/rpi_4_defconfig | 33 +++++++++++++++++++++++++++++++++ + 2 files changed, 66 insertions(+) + create mode 100644 configs/rpi_4_32b_defconfig + create mode 100644 configs/rpi_4_defconfig + +diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig +new file mode 100644 +index 0000000000..a31a617a5f +--- /dev/null ++++ b/configs/rpi_4_32b_defconfig +@@ -0,0 +1,33 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_BCM283X=y ++CONFIG_SYS_TEXT_BASE=0x00008000 ++CONFIG_TARGET_RPI_4_32B=y ++CONFIG_SYS_MALLOC_F_LEN=0x2000 ++CONFIG_DISTRO_DEFAULTS=y ++CONFIG_NR_DRAM_BANKS=1 ++# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set ++CONFIG_OF_BOARD=y ++CONFIG_OF_BOARD_SETUP=y ++CONFIG_MISC_INIT_R=y ++# CONFIG_DISPLAY_CPUINFO is not set ++# CONFIG_DISPLAY_BOARDINFO is not set ++CONFIG_SYS_PROMPT="U-Boot> " ++# CONFIG_CMD_FLASH is not set ++CONFIG_CMD_GPIO=y ++CONFIG_CMD_MMC=y ++CONFIG_CMD_FS_UUID=y ++CONFIG_ENV_FAT_INTERFACE="mmc" ++CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" ++CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y ++CONFIG_DM_KEYBOARD=y ++CONFIG_DM_MMC=y ++CONFIG_MMC_SDHCI=y ++CONFIG_MMC_SDHCI_BCM2835=y ++CONFIG_PINCTRL=y ++# CONFIG_PINCTRL_GENERIC is not set ++# CONFIG_REQUIRE_SERIAL_CONSOLE is not set ++CONFIG_DM_VIDEO=y ++CONFIG_SYS_WHITE_ON_BLACK=y ++CONFIG_CONSOLE_SCROLL_LINES=10 ++CONFIG_PHYS_TO_BUS=y ++CONFIG_OF_LIBFDT_OVERLAY=y +diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig +new file mode 100644 +index 0000000000..da8c960a2a +--- /dev/null ++++ b/configs/rpi_4_defconfig +@@ -0,0 +1,33 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_BCM283X=y ++CONFIG_SYS_TEXT_BASE=0x00080000 ++CONFIG_TARGET_RPI_4=y ++CONFIG_SYS_MALLOC_F_LEN=0x2000 ++CONFIG_DISTRO_DEFAULTS=y ++CONFIG_NR_DRAM_BANKS=1 ++# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set ++CONFIG_OF_BOARD=y ++CONFIG_OF_BOARD_SETUP=y ++CONFIG_MISC_INIT_R=y ++# CONFIG_DISPLAY_CPUINFO is not set ++# CONFIG_DISPLAY_BOARDINFO is not set ++CONFIG_SYS_PROMPT="U-Boot> " ++# CONFIG_CMD_FLASH is not set ++CONFIG_CMD_GPIO=y ++CONFIG_CMD_MMC=y ++CONFIG_CMD_FS_UUID=y ++CONFIG_ENV_FAT_INTERFACE="mmc" ++CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" ++CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y ++CONFIG_DM_KEYBOARD=y ++CONFIG_DM_MMC=y ++CONFIG_MMC_SDHCI=y ++CONFIG_MMC_SDHCI_BCM2835=y ++CONFIG_PINCTRL=y ++# CONFIG_PINCTRL_GENERIC is not set ++# CONFIG_REQUIRE_SERIAL_CONSOLE is not set ++CONFIG_DM_VIDEO=y ++CONFIG_SYS_WHITE_ON_BLACK=y ++CONFIG_CONSOLE_SCROLL_LINES=10 ++CONFIG_PHYS_TO_BUS=y ++CONFIG_OF_LIBFDT_OVERLAY=y +-- +2.22.0 + diff --git a/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0002-ARM-bcm283x-Add-BCM283x_BASE-define.patch b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0002-ARM-bcm283x-Add-BCM283x_BASE-define.patch new file mode 100644 index 00000000..fcf91a6a --- /dev/null +++ b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0002-ARM-bcm283x-Add-BCM283x_BASE-define.patch @@ -0,0 +1,105 @@ +From df2aa4c6be33b468adc09de337a055556d1f37fb Mon Sep 17 00:00:00 2001 +From: Matthias Brugger <mbrugger@suse.com> +Date: Fri, 12 Jul 2019 18:20:53 +0200 +Subject: [PATCH 2/7] ARM: bcm283x: Add BCM283x_BASE define + +Devices of bcm283x have different base address, depending if they are on +bcm2835 or bcm2836/7. Use BCM283x_BASE depending on the SoC you want to +build and only add the offset in the header files. + +Signed-off-by: Matthias Brugger <mbrugger@suse.com> +Signed-off-by: Andrei Gherzan <andrei@balena.io> +Upstream-status: Pending +--- + arch/arm/mach-bcm283x/Kconfig | 5 +++++ + arch/arm/mach-bcm283x/include/mach/mbox.h | 6 +----- + arch/arm/mach-bcm283x/include/mach/sdhci.h | 6 +----- + arch/arm/mach-bcm283x/include/mach/timer.h | 6 +----- + arch/arm/mach-bcm283x/include/mach/wdog.h | 6 +----- + 5 files changed, 9 insertions(+), 20 deletions(-) + +diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig +index 3eb5a9a897..8e69914a83 100644 +--- a/arch/arm/mach-bcm283x/Kconfig ++++ b/arch/arm/mach-bcm283x/Kconfig +@@ -141,4 +141,9 @@ config SYS_SOC + config SYS_CONFIG_NAME + default "rpi" + ++config BCM283x_BASE ++ hex ++ default "0x20000000" if BCM2835 ++ default "0x3f000000" if BCM2836 || BCM2837 ++ + endmenu +diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h +index e3a893e49c..e44c7577da 100644 +--- a/arch/arm/mach-bcm283x/include/mach/mbox.h ++++ b/arch/arm/mach-bcm283x/include/mach/mbox.h +@@ -37,11 +37,7 @@ + + /* Raw mailbox HW */ + +-#ifndef CONFIG_BCM2835 +-#define BCM2835_MBOX_PHYSADDR 0x3f00b880 +-#else +-#define BCM2835_MBOX_PHYSADDR 0x2000b880 +-#endif ++#define BCM2835_MBOX_PHYSADDR (CONFIG_BCM283x_BASE + 0x0000b880) + + struct bcm2835_mbox_regs { + u32 read; +diff --git a/arch/arm/mach-bcm283x/include/mach/sdhci.h b/arch/arm/mach-bcm283x/include/mach/sdhci.h +index 5cb6ec3340..b443c379d8 100644 +--- a/arch/arm/mach-bcm283x/include/mach/sdhci.h ++++ b/arch/arm/mach-bcm283x/include/mach/sdhci.h +@@ -6,11 +6,7 @@ + #ifndef _BCM2835_SDHCI_H_ + #define _BCM2835_SDHCI_H_ + +-#ifndef CONFIG_BCM2835 +-#define BCM2835_SDHCI_BASE 0x3f300000 +-#else +-#define BCM2835_SDHCI_BASE 0x20300000 +-#endif ++#define BCM2835_SDHCI_BASE (CONFIG_BCM283x_BASE + 0x00300000) + + int bcm2835_sdhci_init(u32 regbase, u32 emmc_freq); + +diff --git a/arch/arm/mach-bcm283x/include/mach/timer.h b/arch/arm/mach-bcm283x/include/mach/timer.h +index 56b0c356bb..014355e759 100644 +--- a/arch/arm/mach-bcm283x/include/mach/timer.h ++++ b/arch/arm/mach-bcm283x/include/mach/timer.h +@@ -6,11 +6,7 @@ + #ifndef _BCM2835_TIMER_H + #define _BCM2835_TIMER_H + +-#ifndef CONFIG_BCM2835 +-#define BCM2835_TIMER_PHYSADDR 0x3f003000 +-#else +-#define BCM2835_TIMER_PHYSADDR 0x20003000 +-#endif ++#define BCM2835_TIMER_PHYSADDR (CONFIG_BCM283x_BASE + 0x00003000) + + #define BCM2835_TIMER_CS_M3 (1 << 3) + #define BCM2835_TIMER_CS_M2 (1 << 2) +diff --git a/arch/arm/mach-bcm283x/include/mach/wdog.h b/arch/arm/mach-bcm283x/include/mach/wdog.h +index 99c88e5df7..00b5e06c3a 100644 +--- a/arch/arm/mach-bcm283x/include/mach/wdog.h ++++ b/arch/arm/mach-bcm283x/include/mach/wdog.h +@@ -6,11 +6,7 @@ + #ifndef _BCM2835_WDOG_H + #define _BCM2835_WDOG_H + +-#ifndef CONFIG_BCM2835 +-#define BCM2835_WDOG_PHYSADDR 0x3f100000 +-#else +-#define BCM2835_WDOG_PHYSADDR 0x20100000 +-#endif ++#define BCM2835_WDOG_PHYSADDR (CONFIG_BCM283x_BASE + 0x00100000) + + struct bcm2835_wdog_regs { + u32 unknown0[7]; +-- +2.22.0 + diff --git a/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0003-arm-mach-bcm283x-Define-configs-for-RaspberryPi-4.patch b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0003-arm-mach-bcm283x-Define-configs-for-RaspberryPi-4.patch new file mode 100644 index 00000000..029cac49 --- /dev/null +++ b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0003-arm-mach-bcm283x-Define-configs-for-RaspberryPi-4.patch @@ -0,0 +1,108 @@ +From c03f551cab8fe38de8f0e1781f0e2e339419b003 Mon Sep 17 00:00:00 2001 +From: Andrei Gherzan <andrei@balena.io> +Date: Wed, 17 Jul 2019 15:33:01 +0100 +Subject: [PATCH 3/7] arm: mach-bcm283x: Define configs for RaspberryPi 4 + +Define two target configs for Raspberry Pi 4 (32 and 64bit) and the +corresponding BCM2838* configs. + +Be aware of the current limitation in firmware which requires an +explicit configuration to force the arm in 64bit mode when the +respective target is used. + +Signed-off-by: Andrei Gherzan <andrei@balena.io> +Signed-off-by: Matthias Brugger <mbrugger@suse.com> +Upstream-status: Pending +--- + arch/arm/mach-bcm283x/Kconfig | 62 +++++++++++++++++++++++++++++++++++ + 1 file changed, 62 insertions(+) + +diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig +index 8e69914a83..09a5b42bbb 100644 +--- a/arch/arm/mach-bcm283x/Kconfig ++++ b/arch/arm/mach-bcm283x/Kconfig +@@ -26,6 +26,23 @@ config BCM2837_64B + select BCM2837 + select ARM64 + ++config BCM2838 ++ bool "Broadcom BCM2838 SoC support" ++ depends on ARCH_BCM283X ++ ++config BCM2838_32B ++ bool "Broadcom BCM2838 SoC 32-bit support" ++ depends on ARCH_BCM283X ++ select BCM2838 ++ select ARMV7_LPAE ++ select CPU_V7A ++ ++config BCM2838_64B ++ bool "Broadcom BCM2838 SoC 64-bit support" ++ depends on ARCH_BCM283X ++ select BCM2838 ++ select ARM64 ++ + menu "Broadcom BCM283X family" + depends on ARCH_BCM283X + +@@ -127,6 +144,50 @@ config TARGET_RPI_3 + This option creates a build targeting the ARMv8/AArch64 ISA. + select BCM2837_64B + ++config TARGET_RPI_4_32B ++ bool "Raspberry Pi 4 32-bit build" ++ help ++ Support for all BCM2838-based Raspberry Pi variants, such as ++ the RPi 4 model B, in AArch32 (32-bit) mode. ++ ++ This option assumes the VideoCore firmware is configured to use the ++ mini UART (rather than PL011) for the serial console. This is the ++ default on the RPi 4. To enable the UART console, the following non- ++ default option must be present in config.txt: enable_uart=1. This is ++ required for U-Boot to operate correctly, even if you only care ++ about the HDMI/usbkbd console. ++ ++ Due to hardware incompatibilities, this can't be used with ++ BCM283/5/6/7. ++ ++ This option creates a build targeting the ARMv7/AArch32 ISA. ++ select BCM2838_32B ++ ++config TARGET_RPI_4 ++ bool "Raspberry Pi 4 64-bit build" ++ help ++ Support for all BCM2838-based Raspberry Pi variants, such as ++ the RPi 4 model B, in AArch64 (64-bit) mode. ++ ++ This option assumes the VideoCore firmware is configured to use the ++ mini UART (rather than PL011) for the serial console. This is the ++ default on the RPi 4. To enable the UART console, the following non- ++ default option must be present in config.txt: enable_uart=1. This is ++ required for U-Boot to operate correctly, even if you only care ++ about the HDMI/usbkbd console. ++ ++ Due to hardware incompatibilities, this can't be used with ++ BCM283/5/6/7. ++ ++ Also, due to a bug in firmware, switching to 64bit mode doesn't ++ happen automatically based on the kernel's image filename. See ++ https://github.com/raspberrypi/firmware/issues/1193 for more details. ++ Until that is resolved, the configuration (config.txt) needs to ++ explicitly set: arm_64bit=1. ++ ++ This option creates a build targeting the ARMv8/AArch64 ISA. ++ select BCM2838_64B ++ + endchoice + + config SYS_BOARD +@@ -145,5 +206,6 @@ config BCM283x_BASE + hex + default "0x20000000" if BCM2835 + default "0x3f000000" if BCM2836 || BCM2837 ++ default "0xfe000000" if BCM2838 + + endmenu +-- +2.22.0 + diff --git a/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0004-rpi-Add-entry-for-Raspberry-Pi-4-model-B.patch b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0004-rpi-Add-entry-for-Raspberry-Pi-4-model-B.patch new file mode 100644 index 00000000..7309d2b2 --- /dev/null +++ b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0004-rpi-Add-entry-for-Raspberry-Pi-4-model-B.patch @@ -0,0 +1,33 @@ +From 12fbbd5bc12e225b19d3b4cb193a1bf3d9fa752a Mon Sep 17 00:00:00 2001 +From: Andrei Gherzan <andrei@balena.io> +Date: Wed, 17 Jul 2019 15:34:18 +0100 +Subject: [PATCH 4/7] rpi: Add entry for Raspberry Pi 4 model B + +The Raspebrry Pi 4 uses the new revision code scheme as documented by +the foundation. This change adds an entry for this board as well. + +Signed-off-by: Andrei Gherzan <andrei@balena.io> +Upstream-status: Pending +--- + board/raspberrypi/rpi/rpi.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c +index 617c892dde..92c6534da6 100644 +--- a/board/raspberrypi/rpi/rpi.c ++++ b/board/raspberrypi/rpi/rpi.c +@@ -148,6 +148,11 @@ static const struct rpi_model rpi_models_new_scheme[] = { + DTB_DIR "bcm2837-rpi-cm3.dtb", + false, + }, ++ [0x11] = { ++ "4 Model B", ++ DTB_DIR "bcm2838-rpi-4-b.dtb", ++ true, ++ }, + }; + + static const struct rpi_model rpi_models_old_scheme[] = { +-- +2.22.0 + diff --git a/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0005-arm-bcm283x-Include-definition-for-additional-emmc-c.patch b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0005-arm-bcm283x-Include-definition-for-additional-emmc-c.patch new file mode 100644 index 00000000..44847e01 --- /dev/null +++ b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0005-arm-bcm283x-Include-definition-for-additional-emmc-c.patch @@ -0,0 +1,30 @@ +From fd99a249e6faf234066a6b5da2ed34aaead3d6d9 Mon Sep 17 00:00:00 2001 +From: Andrei Gherzan <andrei@balena.io> +Date: Fri, 12 Jul 2019 11:26:10 +0100 +Subject: [PATCH 5/7] arm: bcm283x: Include definition for additional emmc + clock + +This clock has a different mbox ID so have this included in the relevant +header file. + +Signed-off-by: Andrei Gherzan <andrei@balena.io> +Upstream-status: Pending +--- + arch/arm/mach-bcm283x/include/mach/mbox.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h +index e44c7577da..f2a98acddd 100644 +--- a/arch/arm/mach-bcm283x/include/mach/mbox.h ++++ b/arch/arm/mach-bcm283x/include/mach/mbox.h +@@ -230,6 +230,7 @@ struct bcm2835_mbox_tag_set_power_state { + #define BCM2835_MBOX_CLOCK_ID_SDRAM 8 + #define BCM2835_MBOX_CLOCK_ID_PIXEL 9 + #define BCM2835_MBOX_CLOCK_ID_PWM 10 ++#define BCM2835_MBOX_CLOCK_ID_EMMC2 12 + + struct bcm2835_mbox_tag_get_clock_rate { + struct bcm2835_mbox_tag_hdr tag_hdr; +-- +2.22.0 + diff --git a/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0006-mmc-bcm2835_sdhci-Add-support-for-bcm2711-device.patch b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0006-mmc-bcm2835_sdhci-Add-support-for-bcm2711-device.patch new file mode 100644 index 00000000..d9de5c42 --- /dev/null +++ b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0006-mmc-bcm2835_sdhci-Add-support-for-bcm2711-device.patch @@ -0,0 +1,53 @@ +From 1f42758fe69648340cfae6cae98e667b88923cf6 Mon Sep 17 00:00:00 2001 +From: Matthias Brugger <mbrugger@suse.com> +Date: Wed, 10 Jul 2019 13:24:36 +0200 +Subject: [PATCH 6/7] mmc: bcm2835_sdhci: Add support for bcm2711 device + +The bcm2711 has two emmc controller. The difference is the clocks +they use. Add support for the second emmc contoller. + +Signed-off-by: Matthias Brugger <mbrugger@suse.com> +Signed-off-by: Andrei Gherzan <andrei@balena.io> +Upstream-status: Pending +--- + drivers/mmc/bcm2835_sdhci.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c +index 08bddd410e..e68dec3be7 100644 +--- a/drivers/mmc/bcm2835_sdhci.c ++++ b/drivers/mmc/bcm2835_sdhci.c +@@ -178,12 +178,13 @@ static int bcm2835_sdhci_probe(struct udevice *dev) + fdt_addr_t base; + int emmc_freq; + int ret; ++ int clock_id = (int)dev_get_driver_data(dev); + + base = devfdt_get_addr(dev); + if (base == FDT_ADDR_T_NONE) + return -EINVAL; + +- ret = bcm2835_get_mmc_clock(BCM2835_MBOX_CLOCK_ID_EMMC); ++ ret = bcm2835_get_mmc_clock(clock_id); + if (ret < 0) { + debug("%s: Failed to set MMC clock (err=%d)\n", __func__, ret); + return ret; +@@ -228,7 +229,14 @@ static int bcm2835_sdhci_probe(struct udevice *dev) + } + + static const struct udevice_id bcm2835_sdhci_match[] = { +- { .compatible = "brcm,bcm2835-sdhci" }, ++ { ++ .compatible = "brcm,bcm2835-sdhci", ++ .data = BCM2835_MBOX_CLOCK_ID_EMMC ++ }, ++ { ++ .compatible = "brcm,bcm2711-emmc2", ++ .data = BCM2835_MBOX_CLOCK_ID_EMMC2 ++ }, + { /* sentinel */ } + }; + +-- +2.22.0 + diff --git a/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0007-rpi-Add-memory-map-for-bcm2838.patch b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0007-rpi-Add-memory-map-for-bcm2838.patch new file mode 100644 index 00000000..1d23d9f9 --- /dev/null +++ b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0007-rpi-Add-memory-map-for-bcm2838.patch @@ -0,0 +1,62 @@ +From 76b656349a6786fa81cf69ac7762c31675cd567e Mon Sep 17 00:00:00 2001 +From: Andrei Gherzan <andrei@balena.io> +Date: Fri, 12 Jul 2019 14:27:31 +0100 +Subject: [PATCH 7/7] rpi: Add memory map for bcm2838 + +Define the memory map for the BCM2838 based on the dt configuration +available in the Raspberry Pi kernel fork. + +Signed-off-by: Andrei Gherzan <andrei@balena.io> +Upstream-status: Pending +--- + board/raspberrypi/rpi/rpi.c | 27 ++++++++++++++++++++++++--- + 1 file changed, 24 insertions(+), 3 deletions(-) + +diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c +index 92c6534da6..bddf2a578d 100644 +--- a/board/raspberrypi/rpi/rpi.c ++++ b/board/raspberrypi/rpi/rpi.c +@@ -249,7 +249,8 @@ static uint32_t rev_type; + static const struct rpi_model *model; + + #ifdef CONFIG_ARM64 +-static struct mm_region bcm2837_mem_map[] = { ++#ifndef CONFIG_BCM2838 ++static struct mm_region bcm283x_mem_map[] = { + { + .virt = 0x00000000UL, + .phys = 0x00000000UL, +@@ -268,8 +269,28 @@ static struct mm_region bcm2837_mem_map[] = { + 0, + } + }; +- +-struct mm_region *mem_map = bcm2837_mem_map; ++#else ++static struct mm_region bcm283x_mem_map[] = { ++ { ++ .virt = 0x00000000UL, ++ .phys = 0x00000000UL, ++ .size = 0xfe000000UL, ++ .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | ++ PTE_BLOCK_INNER_SHARE ++ }, { ++ .virt = 0xfe000000UL, ++ .phys = 0xfe000000UL, ++ .size = 0x01800000UL, ++ .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | ++ PTE_BLOCK_NON_SHARE | ++ PTE_BLOCK_PXN | PTE_BLOCK_UXN ++ }, { ++ /* List terminator */ ++ 0, ++ } ++}; ++#endif ++struct mm_region *mem_map = bcm283x_mem_map; + #endif + + int dram_init(void) +-- +2.22.0 + diff --git a/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-fw-utils_2019.07.bbappend b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-fw-utils_2019.07.bbappend new file mode 100644 index 00000000..3daf157d --- /dev/null +++ b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-fw-utils_2019.07.bbappend @@ -0,0 +1,2 @@ +# Apply the same patches for rpi4 as u-boot recipe +require u-boot-rpi4-${PV}.inc diff --git a/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-rpi4-2019.07.inc b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-rpi4-2019.07.inc new file mode 100644 index 00000000..2ce55a2b --- /dev/null +++ b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot-rpi4-2019.07.inc @@ -0,0 +1,12 @@ +FILESEXTRAPATHS_prepend_raspberrypi4 := "${THISDIR}/u-boot-2019.07:" +UBOOT_RPI4_SUPPORT_PATCHES = " \ + file://0001-configs-rpi4-Add-defconfigs-for-rpi4-32-64.patch \ + file://0002-ARM-bcm283x-Add-BCM283x_BASE-define.patch \ + file://0003-arm-mach-bcm283x-Define-configs-for-RaspberryPi-4.patch \ + file://0004-rpi-Add-entry-for-Raspberry-Pi-4-model-B.patch \ + file://0005-arm-bcm283x-Include-definition-for-additional-emmc-c.patch \ + file://0006-mmc-bcm2835_sdhci-Add-support-for-bcm2711-device.patch \ + file://0007-rpi-Add-memory-map-for-bcm2838.patch \ +" + +SRC_URI_append_raspberrypi4 = "${UBOOT_RPI4_SUPPORT_PATCHES}" diff --git a/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot_2019.07.bbappend b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot_2019.07.bbappend index 03e7dc84..6d89f5cb 100644 --- a/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot_2019.07.bbappend +++ b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot_2019.07.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +# Apply the same patches for rpi4 as u-boot recipe +require u-boot-rpi4-${PV}.inc -SRC_URI_raspberrypi4 = "git://github.com/balena-os/u-boot;branch=ag/rpi4" -SRCREV_raspberrypi4 = "62b6e39a53c56a9085aeab1b47b5cc6020fcdb6f" -SRC_URI_raspberrypi4-64 = "git://github.com/balena-os/u-boot;branch=ag/rpi4" -SRCREV_raspberrypi4-64 = "62b6e39a53c56a9085aeab1b47b5cc6020fcdb6f" +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" # Update the patch for u-boot 2019.07 SRC_URI_remove_sota = "file://0001-board-raspberrypi-add-serial-and-revision-to-the-dev.patch" SRC_URI_append_sota = "file://0001-board-raspberrypi-add-serial-and-revision-to-the-dev-2019.07.patch" + +DEPENDS_append_rpi = " rpi-u-boot-scr" diff --git a/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf.bbappend index d652d6be..dd01c4e5 100644 --- a/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf.bbappend +++ b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf.bbappend @@ -4,4 +4,4 @@ SRC_URI += "file://dsi.cfg" # Reduce the screen resolution to HD Ready (720p) SRC_URI_remove = "file://hdmi-a-1-270.cfg" -SRC_URI_append = "file://hdmi-a-1-270-720p.cfg" +SRC_URI_append = " file://hdmi-a-1-270-720p.cfg" diff --git a/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-kernel/create-combined-dtb/create-combined-dtb_1.0.0.bb b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-kernel/create-combined-dtb/create-combined-dtb_1.0.0.bb index 818b5e78..c82e6fd2 100644 --- a/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-kernel/create-combined-dtb/create-combined-dtb_1.0.0.bb +++ b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-kernel/create-combined-dtb/create-combined-dtb_1.0.0.bb @@ -15,27 +15,43 @@ S = "${WORKDIR}" do_compile[depends] += "virtual/kernel:do_deploy" do_compile () { - # Official touchscreen setup (rpi3b/rpi3b dtb, vc4-kms-v3d and ft5406) + # Official touchscreen setup (rpi3b/rpi3b dtb, VC4DTBO and ft5406) if [ -f "${DEPLOY_DIR_IMAGE}/bcm2710-rpi-3-b-plus.dtb" ]; then - fdtoverlay -v -i ${DEPLOY_DIR_IMAGE}/bcm2710-rpi-3-b-plus.dtb -o bcm2710-rpi-3-b-plus+vc4+ft5406.dtb ${DEPLOY_DIR_IMAGE}/rpi-ft5406.dtbo ${DEPLOY_DIR_IMAGE}/vc4-kms-v3d.dtbo - fdtoverlay -v -i ${DEPLOY_DIR_IMAGE}/bcm2710-rpi-3-b.dtb -o bcm2710-rpi-3-b+vc4+ft5406.dtb ${DEPLOY_DIR_IMAGE}/rpi-ft5406.dtbo ${DEPLOY_DIR_IMAGE}/vc4-kms-v3d.dtbo + fdtoverlay -v -i ${DEPLOY_DIR_IMAGE}/bcm2710-rpi-3-b-plus.dtb -o bcm2710-rpi-3-b-plus+vc4+ft5406.dtb ${DEPLOY_DIR_IMAGE}/rpi-ft5406.dtbo ${DEPLOY_DIR_IMAGE}/${VC4DTBO}.dtbo + fi + if [ -f "${DEPLOY_DIR_IMAGE}/bcm2710-rpi-3-b.dtb" ]; then + fdtoverlay -v -i ${DEPLOY_DIR_IMAGE}/bcm2710-rpi-3-b.dtb -o bcm2710-rpi-3-b+vc4+ft5406.dtb ${DEPLOY_DIR_IMAGE}/rpi-ft5406.dtbo ${DEPLOY_DIR_IMAGE}/${VC4DTBO}.dtbo + fi + if [ -f "${DEPLOY_DIR_IMAGE}/bcm2711-rpi-4-b.dtb" ]; then + fdtoverlay -v -i ${DEPLOY_DIR_IMAGE}/bcm2711-rpi-4-b.dtb -o bcm2711-rpi-4-b+vc4+ft5406.dtb ${DEPLOY_DIR_IMAGE}/rpi-ft5406.dtbo ${DEPLOY_DIR_IMAGE}/${VC4DTBO}.dtbo fi - # HDMI screen setup (rpi3b/rpi3b dtb and vc4-kms-v3d) + # HDMI screen setup (rpi3b/rpi3b dtb and VC4DTBO) if [ -f "${DEPLOY_DIR_IMAGE}/bcm2710-rpi-3-b-plus.dtb" ]; then - fdtoverlay -v -i ${DEPLOY_DIR_IMAGE}/bcm2710-rpi-3-b-plus.dtb -o bcm2710-rpi-3-b-plus+vc4.dtb ${DEPLOY_DIR_IMAGE}/vc4-kms-v3d.dtbo - fdtoverlay -v -i ${DEPLOY_DIR_IMAGE}/bcm2710-rpi-3-b.dtb -o bcm2710-rpi-3-b+vc4.dtb ${DEPLOY_DIR_IMAGE}/vc4-kms-v3d.dtbo + fdtoverlay -v -i ${DEPLOY_DIR_IMAGE}/bcm2710-rpi-3-b-plus.dtb -o bcm2710-rpi-3-b-plus+vc4.dtb ${DEPLOY_DIR_IMAGE}/${VC4DTBO}.dtbo + fi + if [ -f "${DEPLOY_DIR_IMAGE}/bcm2710-rpi-3-b.dtb" ]; then + fdtoverlay -v -i ${DEPLOY_DIR_IMAGE}/bcm2710-rpi-3-b.dtb -o bcm2710-rpi-3-b+vc4.dtb ${DEPLOY_DIR_IMAGE}/${VC4DTBO}.dtbo + fi + if [ -f "${DEPLOY_DIR_IMAGE}/bcm2711-rpi-4-b.dtb" ]; then + fdtoverlay -v -i ${DEPLOY_DIR_IMAGE}/bcm2711-rpi-4-b.dtb -o bcm2711-rpi-4-b+vc4.dtb ${DEPLOY_DIR_IMAGE}/${VC4DTBO}.dtbo fi } do_deploy () { install -d ${DEPLOY_DIR_IMAGE} + if [ -f "${S}/bcm2711-rpi-4-b+vc4+ft5406.dtb" ]; then + install -m 0644 ${S}/bcm2711-rpi-4-b+vc4+ft5406.dtb ${DEPLOY_DIR_IMAGE} + fi if [ -f "${S}/bcm2710-rpi-3-b+vc4+ft5406.dtb" ]; then install -m 0644 ${S}/bcm2710-rpi-3-b+vc4+ft5406.dtb ${DEPLOY_DIR_IMAGE} fi if [ -f "${S}/bcm2710-rpi-3+vc4+ft5406.dtb" ]; then install -m 0644 ${S}/bcm2710-rpi-3+vc4+ft5406.dtb ${DEPLOY_DIR_IMAGE} fi + if [ -f "${S}/bcm2711-rpi-4-b+vc4.dtb" ]; then + install -m 0644 ${S}/bcm2711-rpi-4-b+vc4.dtb ${DEPLOY_DIR_IMAGE} + fi if [ -f "${S}/bcm2710-rpi-3-b+vc4.dtb" ]; then install -m 0644 ${S}/bcm2710-rpi-3-b+vc4.dtb ${DEPLOY_DIR_IMAGE} fi diff --git a/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bb b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bb index e58559b8..c1df2274 100644 --- a/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bb +++ b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bb @@ -1,9 +1,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux-raspberrypi:" -LINUX_VERSION ?= "4.19.58" +LINUX_VERSION ?= "4.19.80" LINUX_RPI_BRANCH ?= "rpi-4.19.y" -SRCREV = "8222f38b1ceadd0642d49812fd34a3a6cb00e264" +SRCREV = "3492a1b003494535eb1b17aa7f258469036b1de7" SRC_URI = " \ git://github.com/raspberrypi/linux.git;protocol=git;branch=${LINUX_RPI_BRANCH} \ " diff --git a/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bbappend b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bbappend new file mode 100644 index 00000000..35a09b02 --- /dev/null +++ b/meta-agl/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bbappend @@ -0,0 +1,2 @@ +ENABLE_UART_raspberrypi4 = "1" + diff --git a/meta-agl/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/alsa-state/alsa-state.bbappend b/meta-agl/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/alsa-state/alsa-state.bbappend index 72d991c7..642a71e4 100644 --- a/meta-agl/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/alsa-state/alsa-state.bbappend +++ b/meta-agl/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/alsa-state/alsa-state.bbappend @@ -1 +1,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +COMPATIBLE_MACHINE = "(m3ulcb|h3ulcb|ebisu)" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +do_configure_append_ebisu () { + sed -i 's/state.ak4613\ {/state.rcarsound\ {/g' ${WORKDIR}/asound.state +} diff --git a/meta-agl/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh b/meta-agl/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh index 0dea86bd..2fc3d9f1 100644 --- a/meta-agl/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh +++ b/meta-agl/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh @@ -1,7 +1,7 @@ #!/bin/bash ZIP_1="R-Car_Gen3_Series_Evaluation_Software_Package_for_Linux-weston5-20190802.zip" -ZIP_2="R-Car_Gen3_Series_Evaluation_Software_Package_of_Linux_Drivers-weston5-20190802.zip" +ZIP_2="R-Car_Gen3_Series_Evaluation_Software_Package_of_Linux_Drivers-weston5-20191021.zip" COPY_SCRIPT="$METADIR/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/docs/sample/copyscript/copy_evaproprietary_softwares.sh" @@ -39,8 +39,17 @@ function log() { } function copy_mm_packages() { - # first clean up workdir - [[ -d $EXTRACT_DIR ]] && rm -r $EXTRACT_DIR + # first clean up workdir on need + if [ -d $EXTRACT_DIR ]; then + if [ -f $EXTRACT_DIR/$ZIP_1 -a -f $EXTRACT_DIR/$ZIP_2 ]; then + log "The graphics and multimedia acceleration packages for R-Car Gen3 look already installed." + log "To force their reinstallation, please, remove manually the directory:" + log " $EXTRACT_DIR" + log + return 0 + fi + rm -r $EXTRACT_DIR + fi if [ -f $DOWNLOAD_DIR/$ZIP_1 -a -f $DOWNLOAD_DIR/$ZIP_2 ]; then mkdir -p $EXTRACT_DIR diff --git a/meta-agl/meta-agl-bsp/meta-ti/recipes-arago/weston/weston_%.bbappend b/meta-agl/meta-agl-bsp/meta-ti/recipes-arago/weston/weston_%.bbappend index 5d27bb8e..718d6f86 100644 --- a/meta-agl/meta-agl-bsp/meta-ti/recipes-arago/weston/weston_%.bbappend +++ b/meta-agl/meta-agl-bsp/meta-ti/recipes-arago/weston/weston_%.bbappend @@ -1,6 +1,6 @@ # When configured for fbdev compositor, make it the default PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor WESTON_NATIVE_BACKEND="fbdev-backend.so",--disable-fbdev-compositor,udev mtdev" -PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev libgbm mtdev" +PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/libgbm mtdev" PR_append = ".agl_arago_23" diff --git a/meta-agl/meta-agl-bsp/meta-ti/recipes-bsp/ti-sgx-ddk-km/ti-sgx-ddk-km/0001-Add-support-for-AGL-toolchain.patch b/meta-agl/meta-agl-bsp/meta-ti/recipes-bsp/ti-sgx-ddk-km/ti-sgx-ddk-km/0001-Add-support-for-AGL-toolchain.patch new file mode 100644 index 00000000..93aff157 --- /dev/null +++ b/meta-agl/meta-agl-bsp/meta-ti/recipes-bsp/ti-sgx-ddk-km/ti-sgx-ddk-km/0001-Add-support-for-AGL-toolchain.patch @@ -0,0 +1,30 @@ +From 11131a5e778d19c06eefbcf61447c6efbcee0613 Mon Sep 17 00:00:00 2001 +From: Paul Barker <paul.barker@sancloud.co.uk> +Date: Mon, 18 Nov 2019 08:47:41 +0000 +Subject: [PATCH] Add support for AGL toolchain + +We can use the pre-existing config for arm-linux-gnueabihf, we just need +to make sure our toolchain is matched against this and not +arm-linux-gnueabi. + +Signed-off-by: Paul Barker <paul.barker@sancloud.co.uk> +--- + eurasia_km/eurasiacon/build/linux2/config/compiler.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/eurasia_km/eurasiacon/build/linux2/config/compiler.mk b/eurasia_km/eurasiacon/build/linux2/config/compiler.mk +index 2ba3e5e..03e86c5 100644 +--- a/eurasia_km/eurasiacon/build/linux2/config/compiler.mk ++++ b/eurasia_km/eurasiacon/build/linux2/config/compiler.mk +@@ -68,7 +68,7 @@ define calculate-compiler-preferred-target + ifneq ($$(filter aarch64-%,$$($(1)_compiler_preferred_target)),) + $(1)_compiler_preferred_target := aarch64-linux-gnu + endif +- ifneq ($$(filter arm-%-gnueabihf arm-oe-linux-gnueabi,$$($(1)_compiler_preferred_target)),) ++ ifneq ($$(filter arm-%-gnueabihf arm-oe-linux-gnueabi arm-agl-linux-gnueabi,$$($(1)_compiler_preferred_target)),) + $(1)_compiler_preferred_target := arm-linux-gnueabihf + endif + ifneq ($$(filter arm-%-gnueabi armv7a-cros-linux-gnueabi armv7hl-redhat-linux-gnueabi,$$($(1)_compiler_preferred_target)),) +-- +2.17.1 + diff --git a/meta-agl/meta-agl-bsp/meta-ti/recipes-bsp/ti-sgx-ddk-km/ti-sgx-ddk-km/add-AGL-toolchain-config.patch b/meta-agl/meta-agl-bsp/meta-ti/recipes-bsp/ti-sgx-ddk-km/ti-sgx-ddk-km/add-AGL-toolchain-config.patch deleted file mode 100644 index 9fdd95b4..00000000 --- a/meta-agl/meta-agl-bsp/meta-ti/recipes-bsp/ti-sgx-ddk-km/ti-sgx-ddk-km/add-AGL-toolchain-config.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/eurasia_km/eurasiacon/build/linux2/config/compilers/arm-agl-linux-gnueabi.mk b/eurasia_km/eurasiacon/build/linux2/config/compilers/arm-agl-linux-gnueabi.mk -new file mode 100644 -index 0000000..2abaa9f ---- /dev/null -+++ b/eurasia_km/eurasiacon/build/linux2/config/compilers/arm-agl-linux-gnueabi.mk -@@ -0,0 +1,6 @@ -+# 32-bit ARM hard float compiler -+ifeq ($(MULTIARCH),1) -+ TARGET_SECONDARY_ARCH := target_armhf -+else -+ TARGET_PRIMARY_ARCH := target_armhf -+endif diff --git a/meta-agl/meta-agl-bsp/meta-ti/recipes-bsp/ti-sgx-ddk-km/ti-sgx-ddk-km_%.bbappend b/meta-agl/meta-agl-bsp/meta-ti/recipes-bsp/ti-sgx-ddk-km/ti-sgx-ddk-km_%.bbappend index 182f6cac..6390e660 100644 --- a/meta-agl/meta-agl-bsp/meta-ti/recipes-bsp/ti-sgx-ddk-km/ti-sgx-ddk-km_%.bbappend +++ b/meta-agl/meta-agl-bsp/meta-ti/recipes-bsp/ti-sgx-ddk-km/ti-sgx-ddk-km_%.bbappend @@ -1,4 +1,3 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://add-AGL-toolchain-config.patch" -SRCREV = "16961a3f4524b653fba99d949d6972c77c7d2701" +SRC_URI += "file://0001-Add-support-for-AGL-toolchain.patch" diff --git a/meta-agl/meta-agl-bsp/meta-ti/recipes-graphics/gbm/libgbm_%.bbappend b/meta-agl/meta-agl-bsp/meta-ti/recipes-graphics/gbm/libgbm_%.bbappend deleted file mode 100644 index 7a16fbfe..00000000 --- a/meta-agl/meta-agl-bsp/meta-ti/recipes-graphics/gbm/libgbm_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -# Hotfix for rpm metadata clash with ti-sgx-ddk-um-dev -DIRFILES = "1" diff --git a/meta-agl/meta-agl-bsp/meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_%.bbappend b/meta-agl/meta-agl-bsp/meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_%.bbappend index fe93f1a6..21142df5 100644 --- a/meta-agl/meta-agl-bsp/meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_%.bbappend +++ b/meta-agl/meta-agl-bsp/meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_%.bbappend @@ -16,7 +16,3 @@ do_install_append() { install -d ${D}/etc/ti-sgx install -m 0755 ${D}/etc/init.d/rc.pvr ${D}/etc/ti-sgx } - - -# Fix for rpm metadata clash with libgbm-dev -DIRFILES = "1" diff --git a/meta-agl/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/virtualoutput.cfg b/meta-agl/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/virtualoutput.cfg index 51985127..f69a2e09 100644 --- a/meta-agl/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/virtualoutput.cfg +++ b/meta-agl/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/virtualoutput.cfg @@ -1,5 +1,5 @@ [remote-output] name=remote-1 -mode=384x368@30 +mode=640x720@30 host=192.168.20.99 port=5005 diff --git a/meta-agl/meta-agl-bsp/recipes-graphics/wayland/weston_6.0.0.bb b/meta-agl/meta-agl-bsp/recipes-graphics/wayland/weston_6.0.0.bb index f1e67e31..ca554388 100644 --- a/meta-agl/meta-agl-bsp/recipes-graphics/wayland/weston_6.0.0.bb +++ b/meta-agl/meta-agl-bsp/recipes-graphics/wayland/weston_6.0.0.bb @@ -40,9 +40,9 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev # Compositor choices # # Weston on KMS -PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/mesa virtual/libgbm mtdev" +PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/egl virtual/libgles2 virtual/libgbm mtdev" # Weston on Wayland (nested Weston) -PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,virtual/mesa" +PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,virtual/egl virtual/libgles2" # Weston on X11 PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo" # Headless Weston diff --git a/meta-agl/meta-agl-bsp/recipes-kernel/linux/linux-4.14/net-sch_generic-add-if_afp.h-header-to-get-ARPHRD_CA.patch b/meta-agl/meta-agl-bsp/recipes-kernel/linux/linux-4.14/net-sch_generic-add-if_afp.h-header-to-get-ARPHRD_CA.patch new file mode 100644 index 00000000..7c34fb30 --- /dev/null +++ b/meta-agl/meta-agl-bsp/recipes-kernel/linux/linux-4.14/net-sch_generic-add-if_afp.h-header-to-get-ARPHRD_CA.patch @@ -0,0 +1,25 @@ +From 17d0075d95b5087d5df553444cca390fa479bad9 Mon Sep 17 00:00:00 2001 +From: Matt Ranostay <matt.ranostay@konsulko.com> +Date: Tue, 10 Mar 2020 22:27:28 -0700 +Subject: [PATCH] net: sch_generic: add if_afp.h header to get ARPHRD_CAN macro + +Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com> +--- + net/sched/sch_generic.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c +index bf8c81e07c70..1845ef8c7dbd 100644 +--- a/net/sched/sch_generic.c ++++ b/net/sched/sch_generic.c +@@ -25,6 +25,7 @@ + #include <linux/rcupdate.h> + #include <linux/list.h> + #include <linux/slab.h> ++#include <linux/if_arp.h> + #include <linux/if_vlan.h> + #include <net/sch_generic.h> + #include <net/pkt_sched.h> +-- +2.25.0 + diff --git a/meta-agl/meta-agl-bsp/recipes-kernel/linux/linux-agl-4.14.inc b/meta-agl/meta-agl-bsp/recipes-kernel/linux/linux-agl-4.14.inc index 87249bdc..8521b1d6 100644 --- a/meta-agl/meta-agl-bsp/recipes-kernel/linux/linux-agl-4.14.inc +++ b/meta-agl/meta-agl-bsp/recipes-kernel/linux/linux-agl-4.14.inc @@ -8,3 +8,6 @@ SRC_URI_append_with-lsm-smack = "\ file://Smack-Handle-CGROUP2-in-the-same-way-that-CGROUP.patch \ " +SRC_URI_append = "\ + file://net-sch_generic-add-if_afp.h-header-to-get-ARPHRD_CA.patch \ + " diff --git a/meta-agl/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc b/meta-agl/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc index e8be23c7..7e801e0a 100644 --- a/meta-agl/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc +++ b/meta-agl/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc @@ -2,6 +2,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux:" DEPENDS += "kern-tools-native" +# canbus qdisc pfifo change +SRC_URI_append = " file://net-sch_generic-Use-pfifo_fast-as-fallback-scheduler.patch" + +# bbe target has this upstream patch already +SRC_URI_remove_bbe = " file://net-sch_generic-Use-pfifo_fast-as-fallback-scheduler.patch" + # returns all the elements from the src uri that are .cfg files def find_cfgs(d): sources=src_patches(d, True) @@ -92,3 +98,6 @@ KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/iiodevice.cfg" SRC_URI_append = " file://rtc.cfg" KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/rtc.cfg" +# netfilter options +SRC_URI_append = " file://netfilter.cfg" +KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/netfilter.cfg" diff --git a/meta-agl/meta-agl-bsp/recipes-kernel/linux/linux/ath9k_htc.cfg b/meta-agl/meta-agl-bsp/recipes-kernel/linux/linux/ath9k_htc.cfg index 6f7d4988..ff12e6da 100644 --- a/meta-agl/meta-agl-bsp/recipes-kernel/linux/linux/ath9k_htc.cfg +++ b/meta-agl/meta-agl-bsp/recipes-kernel/linux/linux/ath9k_htc.cfg @@ -1,4 +1,4 @@ CONFIG_CFG80211=m CONFIG_MAC80211=m -CONFIG_ATH_CARDS=m +CONFIG_WLAN_VENDOR_ATH=m CONFIG_ATH9K_HTC=m diff --git a/meta-agl/meta-agl-bsp/recipes-kernel/linux/linux/iiodevice.cfg b/meta-agl/meta-agl-bsp/recipes-kernel/linux/linux/iiodevice.cfg index 8633f29a..c5b8ff35 100644 --- a/meta-agl/meta-agl-bsp/recipes-kernel/linux/linux/iiodevice.cfg +++ b/meta-agl/meta-agl-bsp/recipes-kernel/linux/linux/iiodevice.cfg @@ -22,4 +22,5 @@ CONFIG_IIO_SIMPLE_DUMMY_BUFFER=y # # Triggers - standalone # -CONFIG_IIO_HRTIMER_TRIGGER=m
\ No newline at end of file +CONFIG_IIO_HRTIMER_TRIGGER=m +CONFIG_IIO_TRIGGERED_BUFFER=m diff --git a/meta-agl/meta-agl-bsp/recipes-kernel/linux/linux/net-sch_generic-Use-pfifo_fast-as-fallback-scheduler.patch b/meta-agl/meta-agl-bsp/recipes-kernel/linux/linux/net-sch_generic-Use-pfifo_fast-as-fallback-scheduler.patch new file mode 100644 index 00000000..37ace5a5 --- /dev/null +++ b/meta-agl/meta-agl-bsp/recipes-kernel/linux/linux/net-sch_generic-Use-pfifo_fast-as-fallback-scheduler.patch @@ -0,0 +1,75 @@ +From 546b85bb0aadb5a928b49b53dc02911996169c0b Mon Sep 17 00:00:00 2001 +From: Vincent Prince <vincent.prince.fr@gmail.com> +Date: Wed, 23 Oct 2019 15:44:20 +0200 +Subject: [PATCH] net: sch_generic: Use pfifo_fast as fallback scheduler for + CAN hardware + +There is networking hardware that isn't based on Ethernet for layers 1 and 2. + +For example CAN. + +CAN is a multi-master serial bus standard for connecting Electronic Control +Units [ECUs] also known as nodes. A frame on the CAN bus carries up to 8 bytes +of payload. Frame corruption is detected by a CRC. However frame loss due to +corruption is possible, but a quite unusual phenomenon. + +While fq_codel works great for TCP/IP, it doesn't for CAN. There are a lot of +legacy protocols on top of CAN, which are not build with flow control or high +CAN frame drop rates in mind. + +When using fq_codel, as soon as the queue reaches a certain delay based length, +skbs from the head of the queue are silently dropped. Silently meaning that the +user space using a send() or similar syscall doesn't get an error. However +TCP's flow control algorithm will detect dropped packages and adjust the +bandwidth accordingly. + +When using fq_codel and sending raw frames over CAN, which is the common use +case, the user space thinks the package has been sent without problems, because +send() returned without an error. pfifo_fast will drop skbs, if the queue +length exceeds the maximum. But with this scheduler the skbs at the tail are +dropped, an error (-ENOBUFS) is propagated to user space. So that the user +space can slow down the package generation. + +On distributions, where fq_codel is made default via CONFIG_DEFAULT_NET_SCH +during compile time, or set default during runtime with sysctl +net.core.default_qdisc (see [1]), we get a bad user experience. In my test case +with pfifo_fast, I can transfer thousands of million CAN frames without a frame +drop. On the other hand with fq_codel there is more then one lost CAN frame per +thousand frames. + +As pointed out fq_codel is not suited for CAN hardware, so this patch changes +attach_one_default_qdisc() to use pfifo_fast for "ARPHRD_CAN" network devices. + +During transition of a netdev from down to up state the default queuing +discipline is attached by attach_default_qdiscs() with the help of +attach_one_default_qdisc(). This patch modifies attach_one_default_qdisc() to +attach the pfifo_fast (pfifo_fast_ops) if the network device type is +"ARPHRD_CAN". + +[1] https://github.com/systemd/systemd/issues/9194 + +Suggested-by: Marc Kleine-Budde <mkl@pengutronix.de> +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com> +Acked-by: Dave Taht <dave.taht@gmail.com> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + net/sched/sch_generic.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c +index ed5b0e9fd395..4c5dfcb01e00 100644 +--- a/net/sched/sch_generic.c ++++ b/net/sched/sch_generic.c +@@ -1038,6 +1038,8 @@ static void attach_one_default_qdisc(struct net_device *dev, + + if (dev->priv_flags & IFF_NO_QUEUE) + ops = &noqueue_qdisc_ops; ++ else if(dev->type == ARPHRD_CAN) ++ ops = &pfifo_fast_ops; + + qdisc = qdisc_create_dflt(dev_queue, ops, TC_H_ROOT, NULL); + if (!qdisc) { +-- +2.25.0 + diff --git a/meta-agl/meta-agl-bsp/recipes-kernel/linux/linux/netfilter.cfg b/meta-agl/meta-agl-bsp/recipes-kernel/linux/linux/netfilter.cfg new file mode 100644 index 00000000..34be704c --- /dev/null +++ b/meta-agl/meta-agl-bsp/recipes-kernel/linux/linux/netfilter.cfg @@ -0,0 +1 @@ +CONFIG_NETFILTER_XT_MATCH_OWNER=m diff --git a/meta-agl/meta-agl-bsp/recipes-support/vboxguestdrivers/vboxguestdrivers_%.bbappend b/meta-agl/meta-agl-bsp/recipes-support/vboxguestdrivers/vboxguestdrivers_%.bbappend new file mode 100644 index 00000000..c87b36c1 --- /dev/null +++ b/meta-agl/meta-agl-bsp/recipes-support/vboxguestdrivers/vboxguestdrivers_%.bbappend @@ -0,0 +1 @@ +COMPATIBLE_MACHINE = "(qemux86|qemux86-64|intel-corei7-64)" diff --git a/meta-agl/meta-agl-bsp/wic/systemd-intel-corei7-64-bootdisk.wks b/meta-agl/meta-agl-bsp/wic/systemd-intel-corei7-64-bootdisk.wks index 56393728..db46c183 100644 --- a/meta-agl/meta-agl-bsp/wic/systemd-intel-corei7-64-bootdisk.wks +++ b/meta-agl/meta-agl-bsp/wic/systemd-intel-corei7-64-bootdisk.wks @@ -3,7 +3,7 @@ # can directly dd to boot media. The selected bootloader is systemd-boot # and we do not have swap -part /boot --source bootimg-efi --sourceparams="loader=systemd-boot,initrd=microcode.cpio" --use-uuid --label msdos --active --align 1024 +part /boot --source bootimg-efi --sourceparams="loader=systemd-boot" --use-uuid --label msdos --active --align 1024 part / --source rootfs --fstype=ext4 --label platform --align 1024 --use-uuid diff --git a/meta-agl/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl/meta-agl-distro/conf/distro/poky-agl.conf index 15d8ccb9..d1c580ea 100644 --- a/meta-agl/meta-agl-distro/conf/distro/poky-agl.conf +++ b/meta-agl/meta-agl-distro/conf/distro/poky-agl.conf @@ -6,9 +6,9 @@ DISTRO_NAME = "Automotive Grade Linux" # Release flags -DISTRO_CODENAME = "halibut" -AGL_BRANCH = "halibut" -AGLVERSION = "8.0.2" +DISTRO_CODENAME = "icefish" +AGL_BRANCH = "icefish" +AGLVERSION = "9.0.1" # switch devel/release #AGLRELEASETYPE ?= "agldevelopment" AGLRELEASETYPE ?= "aglrelease" @@ -172,3 +172,6 @@ do_package_write_rpm[vardepsexclude] += "ARCHIVER_TOPDIR PF" # Set preferred provider to new navi application PREFERRED_RPROVIDER_virtual/navigation ?= "ondemandnavi" + +# Set preferred provider for low-can device mapping configuration +PREFERRED_RPROVIDER_virtual/low-can-dev-mapping ?= "dev-mapping" diff --git a/meta-agl/meta-agl-profile-core/classes/cloc.bbclass b/meta-agl/meta-agl-profile-core/classes/cloc.bbclass index 53713bfc..9b73704e 100644 --- a/meta-agl/meta-agl-profile-core/classes/cloc.bbclass +++ b/meta-agl/meta-agl-profile-core/classes/cloc.bbclass @@ -5,6 +5,10 @@ # summary with # cloc --sum-reports `find . -name "*clocreport" | grep -v "\-native" ` --out summary.report +# cloc needs to be installed on the host +# FIXME: create a cloc-native +HOSTTOOLS += "cloc" + CLOC_DIRECTORY ??= "${DEPLOY_DIR}/cloc/" CLOCSTATEDIR = "${WORKDIR}/cloc-destdir/" @@ -24,6 +28,6 @@ python do_cloc() { } -addtask cloc before do_configure after do_unpack +addtask cloc before do_configure after do_patch EXPORT_FUNCTIONS do_cloc diff --git a/meta-agl/meta-agl-profile-core/conf/include/base-agl.inc b/meta-agl/meta-agl-profile-core/conf/include/base-agl.inc index a332c08a..c5cf1a57 100644 --- a/meta-agl/meta-agl-profile-core/conf/include/base-agl.inc +++ b/meta-agl/meta-agl-profile-core/conf/include/base-agl.inc @@ -16,4 +16,5 @@ ASSUME_PROVIDED_remove = "tar-native" # Use static IDs to enable full-filesystem updates USERADDEXTENSION = "useradd-staticids" USERADD_ERROR_DYNAMIC = "error" - +USERADD_GID_TABLES = "files/group" +USERADD_UID_TABLES = "files/passwd" diff --git a/meta-agl/meta-agl-profile-core/files/group b/meta-agl/meta-agl-profile-core/files/group index ebf19e9a..c309f6a0 100644 --- a/meta-agl/meta-agl-profile-core/files/group +++ b/meta-agl/meta-agl-profile-core/files/group @@ -39,7 +39,7 @@ games::60: shutdown::70: users::100: nogroup::65534: -cynara::999: +cynagora::999: dhcp::998: avahi::997: tracing::1000: @@ -63,7 +63,7 @@ datetime::981: network::980: zabbix::979: nm-openvpn::978: -xuser::1002: +xuser::2002: builder::977: rpc::976: crontab::975: diff --git a/meta-agl/meta-agl-profile-core/files/passwd b/meta-agl/meta-agl-profile-core/files/passwd index bd1788f1..ac70c0f9 100644 --- a/meta-agl/meta-agl-profile-core/files/passwd +++ b/meta-agl/meta-agl-profile-core/files/passwd @@ -16,7 +16,7 @@ list::38:38::: irc::39:39::: gnats::41:41::: nobody::65534:65534::: -cynara::999:999::: +cynagora::999:999::: dhcp::998:998::: avahi::997:997::: sshd::996:996::: @@ -35,7 +35,7 @@ mysql::983:983::: polkitd::982:982::: zabbix::979:979::: nm-openvpn::978:978::: -xuser::1002:1002::: +xuser::2002:2002::: builder::977:977::: rpc::976:976::: distcc::973:65534::: diff --git a/meta-agl/meta-agl-profile-core/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb b/meta-agl/meta-agl-profile-core/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb index 91c6b75c..d06cfd26 100644 --- a/meta-agl/meta-agl-profile-core/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb +++ b/meta-agl/meta-agl-profile-core/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb @@ -7,13 +7,13 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-can-low-level;protocol=https;branch=${AGL_BRANCH}" -SRCREV = "087a7c0e7de28bb1c16895ef9d414666d37a35ea" +SRCREV = "${AGL_APP_REVISION}" PV = "${AGLVERSION}" S = "${WORKDIR}/git" -DEPENDS = "libafb-helpers" -RDEPENDS_${PN} = "dev-mapping" +DEPENDS = "libafb-helpers libappcontroller" inherit cmake aglwgt pkgconfig ptest +RDEPENDS_${PN} = "virtual/low-can-dev-mapping" diff --git a/meta-agl/meta-agl-profile-core/recipes-apis/agl-service-hvac/agl-service-hvac-conf_git.bb b/meta-agl/meta-agl-profile-core/recipes-apis/agl-service-hvac/agl-service-hvac-conf_git.bb new file mode 100644 index 00000000..e4dccbf3 --- /dev/null +++ b/meta-agl/meta-agl-profile-core/recipes-apis/agl-service-hvac/agl-service-hvac-conf_git.bb @@ -0,0 +1,27 @@ +SUMMARY = "HVAC Service Binding Configuration" +DESCRIPTION = "AGL HVAC Service Binding Configuration" +HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/agl-service-hvac" +SECTION = "apps" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-hvac;protocol=https;branch=${AGL_BRANCH}" +SRCREV = "${AGL_APP_REVISION}" + +PV = "1.0+git${SRCPV}" +S = "${WORKDIR}/git" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install () { + install -D -m 644 ${S}/hvac.json ${D}${sysconfdir}/hvac.json +} + +do_install_append_ulcb() { + sed -i -e "s#vcan0#sllin0#g" ${D}${sysconfdir}/hvac.json +} + diff --git a/meta-agl/meta-agl-profile-core/recipes-apis/agl-service-hvac/agl-service-hvac_git.bb b/meta-agl/meta-agl-profile-core/recipes-apis/agl-service-hvac/agl-service-hvac_git.bb index f5dc0814..545ab6a2 100644 --- a/meta-agl/meta-agl-profile-core/recipes-apis/agl-service-hvac/agl-service-hvac_git.bb +++ b/meta-agl/meta-agl-profile-core/recipes-apis/agl-service-hvac/agl-service-hvac_git.bb @@ -13,10 +13,8 @@ PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" DEPENDS = "json-c" -RDEPENDS_${PN} += "agl-service-identity-agent" - -do_install_append () { - install -D -m 644 ${S}/hvac.json ${D}${sysconfdir}/hvac.json -} inherit cmake aglwgt pkgconfig + +RDEPENDS_${PN} += "agl-service-identity-agent agl-service-can-low-level" +RRECOMMENDS_${PN} += "agl-service-hvac-conf" diff --git a/meta-agl/meta-agl-profile-core/recipes-apis/agl-service-hvac/agl-service-hvac_git.bbappend b/meta-agl/meta-agl-profile-core/recipes-apis/agl-service-hvac/agl-service-hvac_git.bbappend deleted file mode 100644 index 0817d5ed..00000000 --- a/meta-agl/meta-agl-profile-core/recipes-apis/agl-service-hvac/agl-service-hvac_git.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -# for demo -PACKAGE_ARCH_m3ulcb = "${MACHINE_ARCH}" -do_configure_prepend_m3ulcb() { -sed -i -e "s#vcan0#sllin0#g" ${S}/binding/hvac-demo-binding.c -}
\ No newline at end of file diff --git a/meta-agl/meta-agl-profile-core/recipes-apis/agl-service-navigation/agl-service-navigation_git.bb b/meta-agl/meta-agl-profile-core/recipes-apis/agl-service-navigation/agl-service-navigation_git.bb index c7a6fce0..71a615cf 100755 --- a/meta-agl/meta-agl-profile-core/recipes-apis/agl-service-navigation/agl-service-navigation_git.bb +++ b/meta-agl/meta-agl-profile-core/recipes-apis/agl-service-navigation/agl-service-navigation_git.bb @@ -1,6 +1,5 @@ SUMMARY = "Navigation Service Binding" DESCRIPTION = "AGL Navigation Service API Binding" -HOMEPAGE = "https://github.com/AGLExport/agl-service-navigation" SECTION = "apps" LICENSE = "Apache-2.0" @@ -15,3 +14,5 @@ PV = "0.1+git${SRCPV}" S = "${WORKDIR}/git" inherit cmake aglwgt pkgconfig + +RDEPENDS_${PN} += "json-c libdbus-c++" diff --git a/meta-agl/meta-agl-profile-core/recipes-apis/agl-service-signal-composer/agl-service-signal-composer_git.bb b/meta-agl/meta-agl-profile-core/recipes-apis/agl-service-signal-composer/agl-service-signal-composer_git.bb index 742a7f7f..bf714f45 100644 --- a/meta-agl/meta-agl-profile-core/recipes-apis/agl-service-signal-composer/agl-service-signal-composer_git.bb +++ b/meta-agl/meta-agl-profile-core/recipes-apis/agl-service-signal-composer/agl-service-signal-composer_git.bb @@ -11,9 +11,8 @@ inherit cmake pkgconfig aglwgt ptest DEPENDS += "lua lua-native libappcontroller libafb-helpers" RDEPENDS_${PN} += "lua" -SRC_URI = "gitsm://git.automotivelinux.org/apps/agl-service-signal-composer;protocol=https;branch=${AGL_BRANCH}" -SRCREV = "fe311f49703e9691fa7d515ed84a70b996f7f3e8" +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-signal-composer;protocol=https;branch=${AGL_BRANCH}" +SRCREV = "${AGL_APP_REVISION}" PV = "${AGLVERSION}" S = "${WORKDIR}/git" - diff --git a/meta-agl/meta-agl-profile-core/recipes-apis/agl-service-unicens-controller/agl-service-unicens-controller_git.bb b/meta-agl/meta-agl-profile-core/recipes-apis/agl-service-unicens-controller/agl-service-unicens-controller_git.bb new file mode 100644 index 00000000..85ebc90f --- /dev/null +++ b/meta-agl/meta-agl-profile-core/recipes-apis/agl-service-unicens-controller/agl-service-unicens-controller_git.bb @@ -0,0 +1,19 @@ +SUMMARY = "Infotainment network device control" +DESCRIPTION = "Abstraction layer to control INICnet devices" +HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/agl-service-unicens-controller" +SECTION = "apps" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +SRC_URI = "gitsm://gerrit.automotivelinux.org/gerrit/apps/agl-service-unicens-controller;protocol=https;branch=${AGL_BRANCH}" +SRCREV = "${AGL_APP_REVISION}" + +PV = "0.1+git${SRCPV}" +S = "${WORKDIR}/git" + +inherit cmake aglwgt pkgconfig + +DEPENDS += "json-c af-binder libafb-helpers" +RDEPENDS_${PN} += "agl-service-unicens" + diff --git a/meta-agl/meta-agl-profile-core/recipes-config/dev-mapping/dev-mapping_0.1.bb b/meta-agl/meta-agl-profile-core/recipes-config/dev-mapping/dev-mapping_0.1.bb index befb5443..1309ffa2 100644 --- a/meta-agl/meta-agl-profile-core/recipes-config/dev-mapping/dev-mapping_0.1.bb +++ b/meta-agl/meta-agl-profile-core/recipes-config/dev-mapping/dev-mapping_0.1.bb @@ -1,5 +1,3 @@ -inherit allarch - SUMMARY = "AGL Device mapping configuration file" DESCRIPTION = "This provide default dev-mapping.conf file \ that defines mapping between kernel device and logical name \ @@ -8,11 +6,13 @@ DESCRIPTION = "This provide default dev-mapping.conf file \ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - SRC_URI += "file://dev-mapping.conf.default" +inherit allarch + do_install() { install -d ${D}${sysconfdir} install -m 0644 ${WORKDIR}/dev-mapping.conf.default ${D}${sysconfdir}/dev-mapping.conf } + +RPROVIDES_${PN} = "virtual/low-can-dev-mapping" diff --git a/meta-agl/meta-agl-profile-core/recipes-connectivity/connman/connman_%.bbappend b/meta-agl/meta-agl-profile-core/recipes-connectivity/connman/connman_%.bbappend index 8057fbbc..46934588 100644 --- a/meta-agl/meta-agl-profile-core/recipes-connectivity/connman/connman_%.bbappend +++ b/meta-agl/meta-agl-profile-core/recipes-connectivity/connman/connman_%.bbappend @@ -6,6 +6,9 @@ SRC_URI += "file://0001-disable-when-booting-over-nfs.patch \ FILES_${PN} += "${sysconfdir}/connman/main.conf" +PACKAGECONFIG[session-policy-local] = "--enable-session-policy-local,--disable-session-policy-local," +PACKAGECONFIG_append = " session-policy-local" + do_install_append() { install -d ${D}${sysconfdir}/connman install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/connman diff --git a/meta-agl/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend b/meta-agl/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend new file mode 100644 index 00000000..301a1d57 --- /dev/null +++ b/meta-agl/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend @@ -0,0 +1 @@ +RDEPENDS_${PN}_remove_sota = "systemtap" diff --git a/meta-agl/meta-agl-profile-core/recipes-core/systemd/systemd/0001-network-add-CAN-Termination-tristate-option.patch b/meta-agl/meta-agl-profile-core/recipes-core/systemd/systemd/0001-network-add-CAN-Termination-tristate-option.patch new file mode 100644 index 00000000..3bc7a8f2 --- /dev/null +++ b/meta-agl/meta-agl-profile-core/recipes-core/systemd/systemd/0001-network-add-CAN-Termination-tristate-option.patch @@ -0,0 +1,97 @@ +From 2885f0936d3069fba7bb0078897c98f50927875c Mon Sep 17 00:00:00 2001 +From: Matt Ranostay <matt.ranostay@konsulko.com> +Date: Wed, 19 Feb 2020 12:14:53 -0800 +Subject: [PATCH] network: add CAN Termination tristate option + +Upstream-Status: Submitted +Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com> +--- + src/libsystemd/sd-netlink/netlink-types.c | 1 + + src/network/networkd-link.c | 13 +++++++++++++ + src/network/networkd-network-gperf.gperf | 1 + + src/network/networkd-network.c | 1 + + src/network/networkd-network.h | 1 + + 5 files changed, 17 insertions(+) + +diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c +index c93fe9cb4c..0ce950d5af 100644 +--- a/src/libsystemd/sd-netlink/netlink-types.c ++++ b/src/libsystemd/sd-netlink/netlink-types.c +@@ -298,6 +298,7 @@ static const NLType rtnl_link_info_data_geneve_types[] = { + static const NLType rtnl_link_info_data_can_types[] = { + [IFLA_CAN_BITTIMING] = { .size = sizeof(struct can_bittiming) }, + [IFLA_CAN_RESTART_MS] = { .type = NETLINK_TYPE_U32 }, ++ [IFLA_CAN_TERMINATION] = { .type = NETLINK_TYPE_U16 }, + }; + + /* these strings must match the .kind entries in the kernel */ +diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c +index 4afcf843bd..af1c4ef55c 100644 +--- a/src/network/networkd-link.c ++++ b/src/network/networkd-link.c +@@ -27,6 +27,8 @@ + #include "util.h" + #include "virt.h" + ++#define CAN_TERMINATION_OHM_VALUE 120 ++ + static bool link_dhcp6_enabled(Link *link) { + assert(link); + +@@ -1938,6 +1940,17 @@ static int link_set_can(Link *link) { + return log_link_error_errno(link, r, "Could not append IFLA_CAN_RESTART_MS attribute: %m"); + } + ++ if (link->network->can_termination >= 0) { ++ ++ log_link_debug(link, "%sabling can-termination", link->network->can_termination ? "En" : "Dis"); ++ ++ r = sd_netlink_message_append_u16(m, IFLA_CAN_TERMINATION, ++ link->network->can_termination ? CAN_TERMINATION_OHM_VALUE : 0); ++ if (r < 0) ++ return log_link_error_errno(link, r, "Could not append IFLA_CAN_TERMINATION attribute: %m"); ++ ++ } ++ + r = sd_netlink_message_close_container(m); + if (r < 0) + return log_link_error_errno(link, r, "Failed to close netlink container: %m"); +diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf +index 6ad5257f79..2f6b42809f 100644 +--- a/src/network/networkd-network-gperf.gperf ++++ b/src/network/networkd-network-gperf.gperf +@@ -182,6 +182,7 @@ IPv6Prefix.PreferredLifetimeSec, config_parse_prefix_lifetime, + CAN.BitRate, config_parse_si_size, 0, offsetof(Network, can_bitrate) + CAN.SamplePoint, config_parse_permille, 0, offsetof(Network, can_sample_point) + CAN.RestartSec, config_parse_sec, 0, offsetof(Network, can_restart_us) ++CAN.Termination, config_parse_tristate, 0, offsetof(Network, can_termination) + /* backwards compatibility: do not add new entries to this section */ + Network.IPv4LL, config_parse_ipv4ll, 0, offsetof(Network, link_local) + DHCPv4.UseDNS, config_parse_bool, 0, offsetof(Network, dhcp_use_dns) +diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c +index 429aac5e6c..ded66f5f43 100644 +--- a/src/network/networkd-network.c ++++ b/src/network/networkd-network.c +@@ -248,6 +248,7 @@ static int network_load_one(Manager *manager, const char *filename) { + network->ipv6_accept_ra_use_dns = true; + network->ipv6_accept_ra_route_table = RT_TABLE_MAIN; + network->ipv6_mtu = 0; ++ network->can_termination = -1; + + dropin_dirname = strjoina(network->name, ".network.d"); + +diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h +index 2d46d393ac..1178510107 100644 +--- a/src/network/networkd-network.h ++++ b/src/network/networkd-network.h +@@ -190,6 +190,7 @@ struct Network { + size_t can_bitrate; + unsigned can_sample_point; + usec_t can_restart_us; ++ int can_termination; + + AddressFamilyBoolean ip_forward; + bool ip_masquerade; +-- +2.25.0 + diff --git a/meta-agl/meta-agl-profile-core/recipes-core/systemd/systemd/canbus-can.network b/meta-agl/meta-agl-profile-core/recipes-core/systemd/systemd/canbus-can.network index 9768c4bf..ae5514bc 100644 --- a/meta-agl/meta-agl-profile-core/recipes-core/systemd/systemd/canbus-can.network +++ b/meta-agl/meta-agl-profile-core/recipes-core/systemd/systemd/canbus-can.network @@ -3,3 +3,4 @@ Name=can* [CAN] BitRate=500K +RestartSec=0.1 diff --git a/meta-agl/meta-agl-profile-core/recipes-core/systemd/systemd_%.bbappend b/meta-agl/meta-agl-profile-core/recipes-core/systemd/systemd_%.bbappend index 8c7da439..078c1411 100644 --- a/meta-agl/meta-agl-profile-core/recipes-core/systemd/systemd_%.bbappend +++ b/meta-agl/meta-agl-profile-core/recipes-core/systemd/systemd_%.bbappend @@ -3,6 +3,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "\ file://e2fsck.conf \ file://canbus-can.network \ + file://0001-network-add-CAN-Termination-tristate-option.patch \ ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','systemd','file://wired.network','',d)} \ " @@ -16,7 +17,7 @@ do_install_append() { install -m 644 -p -D ${WORKDIR}/e2fsck.conf ${D}${sysconfdir}/e2fsck.conf # Install canbus network script - install -m 0644 ${WORKDIR}/canbus-can.network ${D}${base_libdir}/systemd/network/60-canbus-can.network + install -m 0644 ${WORKDIR}/canbus-can.network ${D}${nonarch_base_libdir}/systemd/network/60-canbus-can.network if ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','systemd','true','false',d)}; then # Install DHCP configuration for Ethernet adapters diff --git a/meta-agl/meta-agl-profile-core/recipes-devtools/json-c/json-c_%.bbappend b/meta-agl/meta-agl-profile-core/recipes-devtools/json-c/json-c_%.bbappend new file mode 100644 index 00000000..43807bd1 --- /dev/null +++ b/meta-agl/meta-agl-profile-core/recipes-devtools/json-c/json-c_%.bbappend @@ -0,0 +1 @@ +EXTRA_OECONF += "--enable-threading" diff --git a/meta-agl/meta-agl-profile-core/recipes-devtools/libafb-helpers/libafb-helpers_git.inc b/meta-agl/meta-agl-profile-core/recipes-devtools/libafb-helpers/libafb-helpers_git.inc index abb5452d..6753225b 100644 --- a/meta-agl/meta-agl-profile-core/recipes-devtools/libafb-helpers/libafb-helpers_git.inc +++ b/meta-agl/meta-agl-profile-core/recipes-devtools/libafb-helpers/libafb-helpers_git.inc @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/libafb-helpers;protocol=https;branch=${AGL_BRANCH}" -SRCREV = "547374849a76225b1a6a0dd8bb84ae27a601f19d" +SRCREV = "1d1c6cef6039effd4c045a76d30414b589336d0e" PV = "${AGLVERSION}" S = "${WORKDIR}/git" diff --git a/meta-agl/meta-agl-profile-core/recipes-devtools/libappcontroller/libappcontroller_git.bb b/meta-agl/meta-agl-profile-core/recipes-devtools/libappcontroller/libappcontroller_git.bb index 7dbbb5e3..0ee9c5e8 100644 --- a/meta-agl/meta-agl-profile-core/recipes-devtools/libappcontroller/libappcontroller_git.bb +++ b/meta-agl/meta-agl-profile-core/recipes-devtools/libappcontroller/libappcontroller_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/libappcontroller;protocol=https;branch=${AGL_BRANCH}" -SRCREV = "baaa5116b2299b2b01b9fa3199ba95786c2d8a77" +SRCREV = "1bef31c8bbad27f4914484c5007b2e199fb073d4" PV = "${AGLVERSION}" S = "${WORKDIR}/git" diff --git a/meta-agl/meta-agl-profile-core/recipes-devtools/low-level-can-generator/low-level-can-generator_git.bb b/meta-agl/meta-agl-profile-core/recipes-devtools/low-level-can-generator/low-level-can-generator_git.bb index 59e64ce6..080be9a6 100644 --- a/meta-agl/meta-agl-profile-core/recipes-devtools/low-level-can-generator/low-level-can-generator_git.bb +++ b/meta-agl/meta-agl-profile-core/recipes-devtools/low-level-can-generator/low-level-can-generator_git.bb @@ -10,7 +10,7 @@ BBCLASSEXTEND = "nativesdk" DEPENDS = " cmake-apps-module" SRC_URI = "gitsm://gerrit.automotivelinux.org/gerrit/src/low-level-can-generator;protocol=https;branch=${AGL_BRANCH}" -SRCREV = "b7d44a2d155a1199c25b783b915fd8ba3ce42a69" +SRCREV = "d9c40fd96e31ce41166e2b846301335ed6fe5d37" PV = "${AGLVERSION}" S = "${WORKDIR}/git" diff --git a/meta-agl/meta-agl-profile-core/recipes-devtools/packagegroups/packagegroup-agl-core-devel.bb b/meta-agl/meta-agl-profile-core/recipes-devtools/packagegroups/packagegroup-agl-core-devel.bb index 09f65203..97ce254f 100644 --- a/meta-agl/meta-agl-profile-core/recipes-devtools/packagegroups/packagegroup-agl-core-devel.bb +++ b/meta-agl/meta-agl-profile-core/recipes-devtools/packagegroups/packagegroup-agl-core-devel.bb @@ -15,7 +15,6 @@ RDEPENDS_${PN} = "\ perf \ htop \ powertop \ - systemtap \ screen \ usbutils \ rsync \ @@ -25,4 +24,5 @@ RDEPENDS_${PN} = "\ jq \ libxslt-bin \ agl-service-network-tools \ + gcc-sanitizers \ " diff --git a/meta-agl/meta-agl-profile-core/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bb b/meta-agl/meta-agl-profile-core/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bb index b1ecccf8..38bc66df 100644 --- a/meta-agl/meta-agl-profile-core/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bb +++ b/meta-agl/meta-agl-profile-core/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bb @@ -13,7 +13,7 @@ inherit allarch systemd SYSTEMD_SERVICE_${PN} = "run-agl-postinsts.service" -SYSTEMD_SERVICE_AFTER ?= "dbus.service cynara.service" +SYSTEMD_SERVICE_AFTER ?= "dbus.service cynagora.service" SYSTEMD_SERVICE_BEFORE ?= "systemd-user-sessions.service" diff --git a/meta-agl/meta-agl-profile-core/recipes-kernel/most/most.bbappend b/meta-agl/meta-agl-profile-core/recipes-kernel/most/most.bbappend index a90210d8..17ad0558 100644 --- a/meta-agl/meta-agl-profile-core/recipes-kernel/most/most.bbappend +++ b/meta-agl/meta-agl-profile-core/recipes-kernel/most/most.bbappend @@ -1,11 +1,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" def prep_version (d) : - KV = d.getVar('KERNEL_VERSION', True) - if not KV : - return "4.12" - else: - return KV + KV = d.getVar('KERNEL_VERSION', True) + if not KV : + return "4.12" + else: + return KV ORIG_KERN_VER = "${@prep_version(d)}" @@ -15,17 +15,17 @@ APPLY = "${@str('no' if ${VANILLA_KERNEL_VERSION} > 412 else 'yes')}" APPLY_419 = "${@str('no' if ${VANILLA_KERNEL_VERSION} < 419 else 'yes')}" SRC_URI_append = " \ - file://0001-most-aim-network-backport-Kernel-API.patch;apply=${APPLY} \ - file://0002-src-most-add-auto-conf-feature.patch \ - file://0003-core-remove-kernel-log-for-MBO-status.patch \ - file://0004-most-video-set-device_caps.patch \ - file://0005-most-video-set-V4L2_CAP_DEVICE_CAPS-flag.patch \ - file://0006-dim2-fix-startup-sequence.patch \ - file://0007-dim2-use-device-tree.patch \ - file://0008-dim2-read-clock-speed-from-the-device-tree.patch \ - file://0009-dim2-use-device-for-coherent-memory-allocation.patch \ - file://0010-backport-usb-setup-timer.patch \ - file://0011-handle-snd_pcm_lib_mmap_vmalloc-removal.patch;apply=${APPLY_419} \ - " + file://0001-most-aim-network-backport-Kernel-API.patch;apply=${APPLY} \ + file://0002-src-most-add-auto-conf-feature.patch \ + file://0003-core-remove-kernel-log-for-MBO-status.patch \ + file://0004-most-video-set-device_caps.patch \ + file://0005-most-video-set-V4L2_CAP_DEVICE_CAPS-flag.patch \ + file://0006-dim2-fix-startup-sequence.patch \ + file://0007-dim2-use-device-tree.patch \ + file://0008-dim2-read-clock-speed-from-the-device-tree.patch \ + file://0009-dim2-use-device-for-coherent-memory-allocation.patch \ + file://0010-backport-usb-setup-timer.patch \ + file://0011-handle-snd_pcm_lib_mmap_vmalloc-removal.patch;apply=${APPLY_419} \ + " # Make sure we can expose KERNEL_VERSION ... do_patch[depends] += "virtual/kernel:do_populate_sysroot" diff --git a/meta-agl/meta-agl-profile-core/recipes-multimedia/lightmediascanner/files/lightmediascanner.service b/meta-agl/meta-agl-profile-core/recipes-multimedia/lightmediascanner/files/lightmediascanner.service index abd7be7e..63b48ebf 100644 --- a/meta-agl/meta-agl-profile-core/recipes-multimedia/lightmediascanner/files/lightmediascanner.service +++ b/meta-agl/meta-agl-profile-core/recipes-multimedia/lightmediascanner/files/lightmediascanner.service @@ -1,8 +1,12 @@ [Unit] Description=Lightmediascanner (LMS) +After=run-agl-postinsts.service systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount +ConditionPathIsReadWrite=/var/volatile/tmp [Service] Type=dbus +Restart=on-failure +RestartSec=0 BusName=org.lightmediascanner SmackProcessLabel=User::App::agl-service-mediascanner ExecStart=/usr/bin/lightmediascannerd --startup-scan --db-path=/var/volatile/tmp/lightmediascannerd.db --directory=/media diff --git a/meta-agl/meta-agl-profile-core/recipes-platform/images/agl-image-ivi-crosssdk.bb b/meta-agl/meta-agl-profile-core/recipes-platform/images/agl-image-ivi-crosssdk.bb deleted file mode 100644 index 65529877..00000000 --- a/meta-agl/meta-agl-profile-core/recipes-platform/images/agl-image-ivi-crosssdk.bb +++ /dev/null @@ -1,2 +0,0 @@ -# just for backward compatibility -require agl-image-minimal-crosssdk.bb diff --git a/meta-agl/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb b/meta-agl/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb index 03f7e40c..e209c59c 100644 --- a/meta-agl/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb +++ b/meta-agl/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb @@ -12,12 +12,8 @@ ALLOW_EMPTY_${PN} = "1" PKGGROUP_ZEROCONF = "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'packagegroup-base-zeroconf', '', d)}" RDEPENDS_${PN} += "\ - bluez5-obex \ dhcp-server \ - ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','connman','connman connman-client connman-tests connman-tools connman-ncurses','',d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "3g", "libqmi", "", d)} \ + ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','connman','connman connman-client connman-tests \ + connman-tools connman-ncurses connman-plugin-session-policy-local','',d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '${PKGGROUP_ZEROCONF}', '', d)} \ - neard \ - neardal-tools \ - rtl-sdr \ " diff --git a/meta-agl/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-navigation.bb b/meta-agl/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-navigation.bb deleted file mode 100644 index 473bac75..00000000 --- a/meta-agl/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-navigation.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "The software for application framework of AGL IVI profile" -DESCRIPTION = "A set of packages belong to AGL application framework which required by \ -Navigation and Location-Based Services Subsystem" - -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-core-navigation \ - " - -RDEPENDS_${PN} += "\ - gpsd \ - virtual/gpsd-conf \ - geoclue \ - " diff --git a/meta-agl/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-services.bb b/meta-agl/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-services.bb index 82cfb3a1..b6f8f07c 100644 --- a/meta-agl/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-services.bb +++ b/meta-agl/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-services.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "The minimal set of packages for Connectivity Subsystem" +DESCRIPTION = "The minimal set of packages for AGL core Connectivity Subsystem" LICENSE = "MIT" inherit packagegroup @@ -10,24 +10,7 @@ PACKAGES = "\ ALLOW_EMPTY_${PN} = "1" RDEPENDS_${PN} += "\ -agl-service-bluetooth \ -agl-service-bluetooth-map \ -agl-service-bluetooth-pbap \ -agl-service-can-low-level \ agl-service-data-persistence \ -agl-service-geoclue \ -agl-service-geofence \ -agl-service-gps \ -agl-service-identity-agent \ -agl-service-iiodevices \ -agl-service-mediascanner \ -agl-service-navigation \ agl-service-network \ -agl-service-nfc \ -agl-service-signal-composer \ -agl-service-steering-wheel \ -agl-service-unicens \ -agl-service-weather \ agl-service-platform-info \ -high-level-viwi-service \ " diff --git a/meta-agl/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb b/meta-agl/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb index 383b1441..284c961b 100644 --- a/meta-agl/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb +++ b/meta-agl/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb @@ -18,7 +18,6 @@ RDEPENDS_${PN} += "\ RDEPENDS_${PN} += "\ packagegroup-agl-core-connectivity \ - packagegroup-agl-core-navigation \ packagegroup-agl-core-os-commonlibs \ packagegroup-agl-core-services \ packagegroup-agl-core-security \ diff --git a/meta-agl/meta-agl-profile-core/recipes-test/afb-test/afb-test_git.bb b/meta-agl/meta-agl-profile-core/recipes-test/afb-test/afb-test_git.bb index 15fbb6f1..fc1874aa 100644 --- a/meta-agl/meta-agl-profile-core/recipes-test/afb-test/afb-test_git.bb +++ b/meta-agl/meta-agl-profile-core/recipes-test/afb-test/afb-test_git.bb @@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7ca SECTION = "apps" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/app-afb-test;protocol=https;branch=${AGL_BRANCH}" -SRCREV = "3605fd31f04a9198402a687b1a3242835b27cff0" +SRCREV = "4d0948a2eeb60522b773d058f63418fd640d78c5" DEPENDS += "lua libafb-helpers libappcontroller" -RDEPENDS_${PN} += "lua bash" +RDEPENDS_${PN} += "lua bash jq" RDEPENDS_${PN}-ptest += "af-binder" PV = "${AGLVERSION}" diff --git a/meta-agl/meta-agl-profile-graphical-html5/conf/layer.conf b/meta-agl/meta-agl-profile-graphical-html5/conf/layer.conf deleted file mode 100644 index 69967b03..00000000 --- a/meta-agl/meta-agl-profile-graphical-html5/conf/layer.conf +++ /dev/null @@ -1,12 +0,0 @@ -# We have a conf and classes directory, add to BBPATH -BBPATH =. "${LAYERDIR}:" - -# We have recipes-* directories, add to BBFILES -BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ - ${LAYERDIR}/recipes-*/*/*.bbappend" - -BBFILE_COLLECTIONS += "aglprofilegraphicalhtml5" -BBFILE_PATTERN_aglprofilegraphicalhtml5 = "^${LAYERDIR}/" -BBFILE_PRIORITY_aglprofilegraphicalhtml5 = "70" - -LAYERSERIES_COMPAT_aglprofilegraphicalhtml5 = "thud" diff --git a/meta-agl/meta-agl-profile-graphical-html5/recipes-openivi/openivi-html5/openivi-html5/openivi-html5.service b/meta-agl/meta-agl-profile-graphical-html5/recipes-openivi/openivi-html5/openivi-html5/openivi-html5.service deleted file mode 100644 index 2c864847..00000000 --- a/meta-agl/meta-agl-profile-graphical-html5/recipes-openivi/openivi-html5/openivi-html5/openivi-html5.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=HTML5 runtime for OpenIVI Mobility applications -Requires=afm-user-daemon.service InputEventManager.service -After=afm-user-daemon.service InputEventManager.service -ConditionKernelCommandLine=!agl.nogfx - -[Service] -Type=dbus -BusName=org.agl.openivi -ExecStart=/usr/bin/openivi-html5.sh -Restart=on-failure -RestartSec=5 -TimeoutStopSec=1 - -[Install] -WantedBy=default.target diff --git a/meta-agl/meta-agl-profile-graphical-html5/recipes-openivi/openivi-html5/openivi-html5/openivi-html5.sh b/meta-agl/meta-agl-profile-graphical-html5/recipes-openivi/openivi-html5/openivi-html5/openivi-html5.sh deleted file mode 100644 index a318214a..00000000 --- a/meta-agl/meta-agl-profile-graphical-html5/recipes-openivi/openivi-html5/openivi-html5/openivi-html5.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -if test -z "$XDG_CONFIG_DIRS"; then - export XDG_CONFIG_DIRS=/etc/xdg/ -fi - -if test -z "$XDG_RUNTIME_DIR"; then - export XDG_RUNTIME_DIR=/run/user/$UID - mkdir --parents $XDG_RUNTIME_DIR - chmod 0700 $XDG_RUNTIME_DIR -fi - -# Default homescreen -HOMESCREEN=/usr/share/openivi/example/cluster/index.html - -# Read configuration -HOMESCREEN_CONFIG=$XDG_CONFIG_DIRS/openivi-html5/openivi-html5.ini -if [ -e "$HOMESCREEN_CONFIG" ] ; then - HTML=`sed -n '/^homescreen=\(.*\)$/s//\1/p' < $HOMESCREEN_CONFIG` - if [ -n "$HTML" ] ; then - HOMESCREEN=$HTML - fi -fi - -#the following value shall be modified for your display side -SCREEN_W=1080 -SCREEN_H=1920 - -# Demo is configured to FullHD -QT_W=1080 -QT_H=1920 - -QT_IVI_SURFACE_ID=4194304 QT_WAYLAND_SHELL_INTEGRATION=ivi-shell /usr/bin/openivi-html5 -f -u $HOMESCREEN & - -# qmlscene create 2 surfaces -# 0x80000000 : for off screen buffer ? -# 0x80000001 : visible -# -SURFACE_ID_QML=0x80000001 - -# -# layer-add-surfaces wait till 2 surfaces are created. -# -layer-add-surfaces 1000 2 - -/usr/bin/LayerManagerControl set surface $SURFACE_ID_QML destination region 0 0 $SCREEN_W $SCREEN_H -/usr/bin/LayerManagerControl set surface $SURFACE_ID_QML source region 0 0 $QT_W $QT_H -/usr/bin/LayerManagerControl set layer 1000 render order $SURFACE_ID_QML -/usr/bin/LayerManagerControl set surfaces $SURFACE_ID_QML input focus keyboard -/usr/bin/LayerManagerControl set screen 0 render order 1000 diff --git a/meta-agl/meta-agl-profile-graphical-html5/recipes-openivi/openivi-html5/openivi-html5_git.bb b/meta-agl/meta-agl-profile-graphical-html5/recipes-openivi/openivi-html5/openivi-html5_git.bb deleted file mode 100644 index 168b98c7..00000000 --- a/meta-agl/meta-agl-profile-graphical-html5/recipes-openivi/openivi-html5/openivi-html5_git.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "OpenIVI Mobility HTML5 environment" -HOMEPAGE = "https://openivimobility.github.io/" -SECTION = "base" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4641e94ec96f98fabc56ff9cc48be14b" -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI = " \ - git://github.com/openivimobility/openivi-html5.git;branch=master;tag=0b370eea8c7c852365bd717013a523b678abbdba \ - file://openivi-html5.sh \ - file://openivi-html5.service \ -" - -inherit pkgconfig cmake_qt5 externalsrc systemd -PV = "0.1" - -S = "${WORKDIR}/git" - -RDEPENDS_${PN} = "qtbase qtwebkit inputeventmanager windowmanager" -DEPENDS = "qtbase-native qtbase qtwebkit" - -EXTRA_OECMAKE = " -DCMAKE_DISABLE_FIND_PACKAGE_X11=TRUE " - -FILES_${PN} = "/usr/bin/openivi-html5 /usr/share/openivi/*" - -do_install() { - install -d ${D}${bindir} - install -m 0755 openivi-html5 ${D}${bindir} - - install -d ${D}${datadir}/openivi/ - cp -r ${S}/example ${D}${datadir}/openivi/ - - install -p -D ${WORKDIR}/openivi-html5.sh ${D}${bindir}/openivi-html5.sh - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${systemd_user_unitdir} - install -p -D ${WORKDIR}/openivi-html5.service ${D}${systemd_user_unitdir}/openivi-html5.service - install -d ${D}${sysconfdir}/systemd/user/default.target.wants - ln -sf ${systemd_user_unitdir}/openivi-html5.service ${D}${sysconfdir}/systemd/user/default.target.wants - fi -} - -FILES_${PN} += " ${prefix}/bin/openivi-html5.sh ${systemd_user_unitdir} ${sysconfdir}" diff --git a/meta-agl/meta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5-crosssdk.bb b/meta-agl/meta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5-crosssdk.bb deleted file mode 100755 index 2d811205..00000000 --- a/meta-agl/meta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5-crosssdk.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "Cross SDK of Full AGL Distribution for IVI profile" - -DESCRIPTION = "SDK image for full AGL Distribution for IVI profile. \ -It includes the full meta-toolchain, plus developement headers and libraries \ -to form a standalone cross SDK." - -require agl-demo-platform-html5.bb - -LICENSE = "MIT" - -IMAGE_FEATURES_append = " dev-pkgs" -IMAGE_INSTALL_append = " kernel-dev kernel-devsrc" - -inherit populate_sdk populate_sdk_qt5 - -# Task do_populate_sdk and do_rootfs can't be exec simultaneously. -# Both exec "createrepo" on the same directory, and so one of them -# can failed (randomly). -addtask do_populate_sdk after do_rootfs - -# native tools to support Chromium build inside SDK (SPEC-942) -TOOLCHAIN_HOST_TASK += " \ - nativesdk-gn \ - nativesdk-ninja \ - nativesdk-gperf \ - nativesdk-zlib \ - nativesdk-xz \ - nativesdk-nspr-dev \ - nativesdk-nss-dev \ - nativesdk-lua \ - " - -# required dependencies for Chromium build inside SDK (SPEC-942) -TOOLCHAIN_TARGET_TASK += " \ - pciutils-dev \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio-dev' , '', d)} \ - cairo-dev \ - nss-dev \ - cups-dev \ - gconf-dev \ - libexif-dev \ - pango-dev \ - libdrm-dev \ - lua-dev \ - lua-staticdev \ - ${@bb.utils.contains('LICENSE_FLAGS_WHITELIST', 'commercial', 'ffmpeg-dev', '', d)} \ - " - -# Add wayland-scanner to SDK (SPEC-945) -# Use TOOLCHAIN_HOST_TASK instead of adding to the packagegroup -# wayland-scanner is in nativesdk-wayland-dev ! -# option: add also nativesdk-qtwayland-tools -TOOLCHAIN_HOST_TASK_append = " nativesdk-wayland nativesdk-wayland-dev" - -TOOLCHAIN_HOST_TASK_append = " nativesdk-perl-modules " diff --git a/meta-agl/meta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5.bb b/meta-agl/meta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5.bb deleted file mode 100644 index c9247a85..00000000 --- a/meta-agl/meta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "AGL Demo Platform image currently contains a simple HMI and \ -demos." - -LICENSE = "MIT" - -require agl-demo-platform-html5.inc - -IMAGE_INSTALL_append = "\ - packagegroup-agl-demo-platform-html5 \ - " diff --git a/meta-agl/meta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5.inc b/meta-agl/meta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5.inc deleted file mode 100644 index f2f28861..00000000 --- a/meta-agl/meta-agl-profile-graphical-html5/recipes-platform/images/agl-demo-platform-html5.inc +++ /dev/null @@ -1,2 +0,0 @@ -# Base image -require recipes-platform/images/agl-image-minimal.inc diff --git a/meta-agl/meta-agl-profile-graphical-html5/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb b/meta-agl/meta-agl-profile-graphical-html5/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb deleted file mode 100644 index ee5c1f70..00000000 --- a/meta-agl/meta-agl-profile-graphical-html5/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "The software for DEMO platform of AGL IVI profile" -DESCRIPTION = "A set of packages belong to AGL Demo Platform" - -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-demo-platform-html5 \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - packagegroup-agl-image-ivi \ - " - -# add packages for demo platform (include demo apps) here -#RDEPENDS_${PN} += " \ -# packagegroup-agl-demo \ -# " - -# add packages for OpenIVI-HTML5 demo -RDEPENDS_${PN} += " \ - openivi-html5 \ - " diff --git a/meta-agl/meta-agl-profile-graphical-qt5/recipes-devtools/libqtappfw/libqtappfw_git.bb b/meta-agl/meta-agl-profile-graphical-qt5/recipes-devtools/libqtappfw/libqtappfw_git.bb new file mode 100644 index 00000000..f4d85d75 --- /dev/null +++ b/meta-agl/meta-agl-profile-graphical-qt5/recipes-devtools/libqtappfw/libqtappfw_git.bb @@ -0,0 +1,20 @@ +SUMMARY = "AGL Qt AppFW Library" +DESCRIPTION = "libqtappfw" +HOMEPAGE = "http://docs.automotivelinux.org" +LICENSE = "Apache-2.0" +SECTION = "libs" + +BBCLASSEXTEND = "nativesdk" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" + +DEPENDS += "qtbase qtdeclarative qtwebsockets" + +inherit cmake_qt5 + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/libqtappfw;protocol=https;branch=${AGL_BRANCH}" +SRCREV = "cd1a7f3bcbaef1e9c23549f472bce4ae42b2afad" +S = "${WORKDIR}/git/" + +# PV needs to be modified with SRCPV to work AUTOREV correctly +PV = "0.0+git${SRCPV}" diff --git a/meta-agl/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb b/meta-agl/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb index 8477b394..cfc465e6 100755 --- a/meta-agl/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb +++ b/meta-agl/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb @@ -33,7 +33,7 @@ TOOLCHAIN_HOST_TASK += " \ # required dependencies for Chromium build inside SDK (SPEC-942) TOOLCHAIN_TARGET_TASK += " \ pciutils-dev \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio-dev' , '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'pipewire-dev wireplumber-dev', '', d)} \ cairo-dev \ nss-dev \ cups-dev \ diff --git a/meta-agl/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtlocation/0001-mapbox-update-API-url-to-match-new-schema.patch b/meta-agl/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtlocation/0001-mapbox-update-API-url-to-match-new-schema.patch new file mode 100644 index 00000000..ba8a991e --- /dev/null +++ b/meta-agl/meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtlocation/0001-mapbox-update-API-url-to-match-new-schema.patch @@ -0,0 +1,47 @@ +From 58197439eade86e7efc6fe98116c0092ea429d29 Mon Sep 17 00:00:00 2001 +From: Matt Ranostay <matt.ranostay@konsulko.com> +Date: Tue, 10 Mar 2020 13:59:58 -0700 +Subject: [PATCH] mapbox: update API url to match new schema + +--- + src/plugins/geoservices/mapbox/qgeotilefetchermapbox.cpp | 7 ++++--- + src/plugins/geoservices/mapbox/qmapboxcommon.h | 2 +- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/plugins/geoservices/mapbox/qgeotilefetchermapbox.cpp b/src/plugins/geoservices/mapbox/qgeotilefetchermapbox.cpp +index 0b128556..bd2be6b6 100644 +--- a/src/plugins/geoservices/mapbox/qgeotilefetchermapbox.cpp ++++ b/src/plugins/geoservices/mapbox/qgeotilefetchermapbox.cpp +@@ -88,12 +88,13 @@ QGeoTiledMapReply *QGeoTileFetcherMapbox::getTileImage(const QGeoTileSpec &spec) + request.setRawHeader("User-Agent", m_userAgent); + + request.setUrl(QUrl(mapboxTilesApiPath + +- ((spec.mapId() >= m_mapIds.size()) ? QStringLiteral("mapbox.streets") : m_mapIds[spec.mapId() - 1]) + QLatin1Char('/') + ++ m_mapIds[m_mapIds.size() - 1] + ++ QStringLiteral("/tiles/256/") + + QString::number(spec.zoom()) + QLatin1Char('/') + + QString::number(spec.x()) + QLatin1Char('/') + + QString::number(spec.y()) + +- ((m_scaleFactor > 1) ? (QLatin1Char('@') + QString::number(m_scaleFactor) + QLatin1String("x.")) : QLatin1String(".")) + +- m_format + QLatin1Char('?') + ++ ((m_scaleFactor > 1) ? (QLatin1Char('@') + QString::number(m_scaleFactor) + QLatin1String("x")) : QLatin1String("")) + ++ QLatin1Char('?') + + QStringLiteral("access_token=") + m_accessToken)); + + QNetworkReply *reply = m_networkManager->get(request); +diff --git a/src/plugins/geoservices/mapbox/qmapboxcommon.h b/src/plugins/geoservices/mapbox/qmapboxcommon.h +index e60c4e83..4b2ea98d 100644 +--- a/src/plugins/geoservices/mapbox/qmapboxcommon.h ++++ b/src/plugins/geoservices/mapbox/qmapboxcommon.h +@@ -46,7 +46,7 @@ + + QT_BEGIN_NAMESPACE + +-static const QString mapboxTilesApiPath = QStringLiteral("http://api.tiles.mapbox.com/v4/"); ++static const QString mapboxTilesApiPath = QStringLiteral("https://api.mapbox.com/"); + + // https://www.mapbox.com/api-documentation/#geocoding + static const QString mapboxGeocodingApiPath = QStringLiteral("https://api.mapbox.com/geocoding/v5/mapbox.places/"); +-- +2.25.0 + diff --git a/meta-agl/meta-agl-profile-graphical/recipes-apis/agl-service-taskmanager/agl-service-taskmanager.bb b/meta-agl/meta-agl-profile-graphical/recipes-apis/agl-service-taskmanager/agl-service-taskmanager.bb index 7152144c..490b3f9d 100644 --- a/meta-agl/meta-agl-profile-graphical/recipes-apis/agl-service-taskmanager/agl-service-taskmanager.bb +++ b/meta-agl/meta-agl-profile-graphical/recipes-apis/agl-service-taskmanager/agl-service-taskmanager.bb @@ -6,7 +6,7 @@ SECTION = "apps" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" -SRC_URI = "gitsm://gerrit.automotivelinux.org/gerrit/apps/agl-service-taskmanager;protocol=https;branch=${AGL_BRANCH}" +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-taskmanager;protocol=https;branch=${AGL_BRANCH}" SRCREV = "${AGL_APP_REVISION}" PV = "1.0+git${SRCPV}" diff --git a/meta-agl/meta-agl-profile-graphical/recipes-apis/agl-service-windowmanager/agl-service-windowmanager_git.bb b/meta-agl/meta-agl-profile-graphical/recipes-apis/agl-service-windowmanager/agl-service-windowmanager_git.bb index aacd9ccf..4be5ab1d 100644 --- a/meta-agl/meta-agl-profile-graphical/recipes-apis/agl-service-windowmanager/agl-service-windowmanager_git.bb +++ b/meta-agl/meta-agl-profile-graphical/recipes-apis/agl-service-windowmanager/agl-service-windowmanager_git.bb @@ -16,7 +16,7 @@ inherit cmake aglwgt SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-windowmanager;protocol=https;branch=${AGL_BRANCH} \ file://weston-ready.conf \ " -SRCREV = "c850f10572d9252f7650065d5a305ca3739fea13" +SRCREV = "${AGL_APP_REVISION}" PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-agl/meta-agl-profile-graphical/recipes-graphics/libhomescreen/libhomescreen/org.agl.statusbar.conf b/meta-agl/meta-agl-profile-graphical/recipes-graphics/libhomescreen/libhomescreen/org.agl.statusbar.conf deleted file mode 100644 index dc3852ee..00000000 --- a/meta-agl/meta-agl-profile-graphical/recipes-graphics/libhomescreen/libhomescreen/org.agl.statusbar.conf +++ /dev/null @@ -1,16 +0,0 @@ -<!DOCTYPE busconfig PUBLIC -"-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" -"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - <policy context="default"> - <!-- Allow everyone to talk to main service. We'll later add an agent to - only share the location if user allows it. --> - <allow send_interface="org.agl.statusbar"/> - </policy> - - <policy user="root"> - <!-- Allow root to own the name on the bus --> - <allow own="org.agl.statusbar"/> - </policy> -</busconfig> - diff --git a/meta-agl/meta-agl-profile-graphical/recipes-graphics/libhomescreen/libhomescreen_git.bb b/meta-agl/meta-agl-profile-graphical/recipes-graphics/libhomescreen/libhomescreen_git.bb index 1acd7af8..da511c8a 100644 --- a/meta-agl/meta-agl-profile-graphical/recipes-graphics/libhomescreen/libhomescreen_git.bb +++ b/meta-agl/meta-agl-profile-graphical/recipes-graphics/libhomescreen/libhomescreen_git.bb @@ -12,15 +12,8 @@ DEPENDS = "af-binder json-c" inherit cmake -SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/libhomescreen.git;protocol=https;branch=${AGL_BRANCH} \ - file://org.agl.statusbar.conf \ - " -SRCREV = "44290c49e08fe52d6e3ed80720473577131090f4" +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/libhomescreen.git;protocol=https;branch=${AGL_BRANCH}" +SRCREV = "0d65d54ba63508c0ef545d02e94d5702f9c8ecb3" S = "${WORKDIR}/git" -do_install_append() { - mkdir -p ${D}${sysconfdir}/dbus-1/session.d - install -m 0644 ${WORKDIR}/org.agl.statusbar.conf ${D}${sysconfdir}/dbus-1/session.d -} - RDEPENDS_${PN} = "agl-service-homescreen" diff --git a/meta-agl/meta-agl-profile-graphical/recipes-graphics/libwindowmanager/libwindowmanager_git.bb b/meta-agl/meta-agl-profile-graphical/recipes-graphics/libwindowmanager/libwindowmanager_git.bb index 04a83dd1..56e9a0d9 100644 --- a/meta-agl/meta-agl-profile-graphical/recipes-graphics/libwindowmanager/libwindowmanager_git.bb +++ b/meta-agl/meta-agl-profile-graphical/recipes-graphics/libwindowmanager/libwindowmanager_git.bb @@ -10,6 +10,7 @@ RDEPENDS_${PN} = "agl-service-windowmanager" inherit cmake SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/libwindowmanager.git;protocol=https;branch=${AGL_BRANCH}" -SRCREV = "003cdfb640b595345b0d4d09471872c9295d0bc7" +SRCREV = "949e8b8c90dfb37988b542df171c39941aee7bcb" S = "${WORKDIR}/git" PV = "1.0+git${SRCPV}" + diff --git a/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/agl-compositor_git.bb b/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/agl-compositor_git.bb new file mode 100644 index 00000000..2efcc9bd --- /dev/null +++ b/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/agl-compositor_git.bb @@ -0,0 +1,21 @@ +SUMMARY = "Reference Wayland compositor for AGL" +DESCRIPTION = "The AGL compositor is a reference Wayland server for Automotive \ +Grade Linux, using libweston as a base to provide a graphical environment for \ +the automotive environment." + +HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/q/project:src%252Fagl-compositor" +SECTION = "x11" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=fac6abe0003c4d142ff8fa1f18316df0" + +DEPENDS = "wayland wayland-protocols wayland-native weston" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/agl-compositor.git;protocol=https;branch=${AGL_BRANCH}" +SRCREV = "facb744f37ecb40dde776300ab9e99ef21fc7991" + +PV = "0.0.10+git${SRCPV}" +S = "${WORKDIR}/git" + +inherit meson pkgconfig python3native + +FILES_${PN} = "${bindir}/agl-compositor" diff --git a/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/waltham-transmitter_git.bb b/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/waltham-transmitter_git.bb index 9f6684fc..89d97f51 100644 --- a/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/waltham-transmitter_git.bb +++ b/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/waltham-transmitter_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://waltham-transmitter/COPYING;md5=f21c9af4de068fb53b83f DEPENDS += "libdrm virtual/kernel wayland wayland-native waltham weston gstreamer1.0 gstreamer gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad wayland-ivi-extension" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/weston-ivi-plugins.git;protocol=https;branch=${AGL_BRANCH}" -SRCREV = "0fc0e974749f4ce35e14c23b050aa8fe693c3ce5" +SRCREV = "5287483228fa1e28f3217a54606cfe760c6582bd" S = "${WORKDIR}/git/" @@ -20,11 +20,11 @@ inherit pkgconfig cmake do_install_append () { install -d ${D}/etc/xdg/weston/ - install ${S}/${WALTHAM_PIPELINE_TRANSMITTER} ${D}/etc/xdg/weston/pipeline.cfg + install ${S}/${WALTHAM_PIPELINE_TRANSMITTER} ${D}/etc/xdg/weston/transmitter_pipeline.cfg install ${S}/${WALTHAM_PIPELINE_RECEIVER} ${D}/etc/xdg/weston/receiver_pipeline.cfg - sed -i -e "s/YOUR_RECIEVER_IP/${WALTHAM_RECIEVER_IP}/g" ${D}/etc/xdg/weston/pipeline.cfg - sed -i -e "s/YOUR_RECIEVER_PORT/${WALTHAM_RECEIVER_PORT}/g" ${D}/etc/xdg/weston/pipeline.cfg + sed -i -e "s/YOUR_RECIEVER_IP/${WALTHAM_RECIEVER_IP}/g" ${D}/etc/xdg/weston/transmitter_pipeline.cfg + sed -i -e "s/YOUR_RECIEVER_PORT/${WALTHAM_RECEIVER_PORT}/g" ${D}/etc/xdg/weston/transmitter_pipeline.cfg sed -i -e "s/YOUR_RECIEVER_PORT/${WALTHAM_RECEIVER_PORT}/g" ${D}/etc/xdg/weston/receiver_pipeline.cfg } diff --git a/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init.bbappend b/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init.bbappend index 910cf5a6..247aeeee 100644 --- a/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init.bbappend +++ b/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init.bbappend @@ -3,79 +3,70 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" inherit agl-graphical -WESTONSTART ??= "/usr/bin/weston ${WESTONARGS}" +WESTONSTART ??= "${@bb.utils.contains("DISTRO_FEATURES", "agl-compositor", "/usr/bin/agl-compositor", "/usr/bin/weston",d)} ${WESTONARGS}" WESTONSTART_append = " ${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", " --log=${DISPLAY_XDG_RUNTIME_DIR}/weston.log", "",d)}" -SRC_URI += " \ - file://weston_tmpfiles.conf \ - file://weston.service.add \ +DROPIN_NAME = "weston-init" + +WIFILES = " \ + file://weston.conf.in \ + file://tmpfiles.conf.in \ + file://zz-dri.rules.in \ + file://zz-input.rules \ + file://zz-tty.rules.in \ " -do_install_append() { - sed -i "/\[Unit\]/aConflicts=getty@tty${WESTONTTY}.service" \ - ${D}${systemd_system_unitdir}/weston.service - - sed -i "/\[Service\]/r ${S}/weston.service.add" \ - ${D}${systemd_system_unitdir}/weston.service - - if ! grep -q '^Group=' ${D}${systemd_system_unitdir}/weston.service; then - sed -i "/\[Service\]/aGroup=root" ${D}${systemd_system_unitdir}/weston.service - fi - if ! grep -q '^User=' ${D}${systemd_system_unitdir}/weston.service; then - sed -i "/\[Service\]/aUser=root" ${D}${systemd_system_unitdir}/weston.service - fi - - sed -e 's,User=root,User=${WESTONUSER},g' \ - -e 's,Group=root,Group=${WESTONGROUP},g' \ - -e 's,ExecStart=.*,ExecStart=${WESTONSTART},g' \ - -e 's,@WESTONTTY@,${WESTONTTY},g' \ - -e 's,@XDG_RUNTIME_DIR@,${DISPLAY_XDG_RUNTIME_DIR},g' \ - -e '/PAMName=/d' \ - -i ${D}${systemd_system_unitdir}/weston.service - - # Add a rule to ensure the 'display' user has permissions to - # open the graphics device - install -d ${D}${sysconfdir}/init.d - install -d ${D}${sysconfdir}/udev/rules.d - cat >${D}${sysconfdir}/udev/rules.d/zz-dri.rules <<'EOF' -SUBSYSTEM=="drm", MODE="0660", GROUP="${WESTONGROUP}", SECLABEL{smack}="*", TAG+="systemd", ENV{SYSTEMD_WANTS}="weston.service" -EOF - - # user 'display' must own /dev/tty${WESTONTTY} for weston to start correctly - cat >${D}${sysconfdir}/udev/rules.d/zz-tty.rules <<'EOF' -SUBSYSTEM=="tty", KERNEL=="tty${WESTONTTY}", OWNER="${WESTONUSER}", SECLABEL{smack}="^", TAG+="systemd", ENV{SYSTEMD_WANTS}="weston.service" -EOF - - # user 'display' must also be able to access /dev/input/* - cat >${D}${sysconfdir}/udev/rules.d/zz-input.rules <<'EOF' -SUBSYSTEM=="input", MODE="0660", GROUP="input", SECLABEL{smack}="^", TAG+="systemd", ENV{SYSTEMD_WANTS}="weston.service" -EOF - - # user 'display' must also be able to access /dev/media*, etc. - cat >${D}${sysconfdir}/udev/rules.d/zz-remote-display.rules <<'EOF' -SUBSYSTEM=="media", MODE="0660", GROUP="display", SECLABEL{smack}="*", TAG+="systemd", ENV{SYSTEMD_WANTS}="weston.service" -SUBSYSTEM=="video4linux", MODE="0660", GROUP="display", SECLABEL{smack}="*", TAG+="systemd", ENV{SYSTEMD_WANTS}="weston.service" -KERNEL=="uvcs", SUBSYSTEM=="misc", MODE="0660", GROUP="display", SECLABEL{smack}="*" -KERNEL=="rgnmm", SUBSYSTEM=="misc", MODE="0660", GROUP="display", SECLABEL{smack}="*" -EOF - - install -d ${D}${sysconfdir}/tmpfiles.d - install -Dm755 ${WORKDIR}/weston_tmpfiles.conf ${D}/${libdir}/tmpfiles.d/weston.conf - - sed -e 's,@WESTONUSER@,${WESTONUSER},g' \ - -e 's,@WESTONGROUP@,${WESTONGROUP},g' \ - -i ${D}/${libdir}/tmpfiles.d/weston.conf -} +WIFILES_append_imx = " \ + file://zz-dri-imx.rules.in \ +" -do_install_append_imx() { +SRC_URI_append = " ${WIFILES}" - install -d ${D}${sysconfdir}/udev/rules.d - cat >>${D}${sysconfdir}/udev/rules.d/zz-dri.rules <<'EOF' -SUBSYSTEM=="gpu_class", MODE="0660", GROUP="${WESTONGROUP}", SECLABEL{smack}="*" -EOF +do_install_append() { + # files + files=$(echo ${WIFILES} | sed s,file://,,g) + + # process ".in" files + for f in ${files}; do + g=${f%.in} + if [ "${f}" != "${g}" ]; then + sed -e "s,@WESTONUSER@,${WESTONUSER},g" \ + -e "s,@WESTONGROUP@,${WESTONGROUP},g" \ + -e "s,@XDG_RUNTIME_DIR@,${DISPLAY_XDG_RUNTIME_DIR},g" \ + -e "s,@WESTONTTY@,${WESTONTTY},g" \ + -e "s,@WESTONSTART@,${WESTONSTART},g" \ + ${WORKDIR}/${f} > ${WORKDIR}/${g} + fi + done + + # removes any unexpected entry from weston.service + for x in Group User ExecStart PAMName; do + sed -i "/^ *$x *=/d" ${D}${systemd_system_unitdir}/weston.service + done + + # install weston drop-in + install -d ${D}${systemd_system_unitdir}/weston.service.d + install -m644 ${WORKDIR}/weston.conf ${D}/${systemd_system_unitdir}/weston.service.d/${DROPIN_NAME}.conf + + # install tmpfiles drop-in + install -d ${D}${libdir}/tmpfiles.d + install -m644 ${WORKDIR}/tmpfiles.conf ${D}${libdir}/tmpfiles.d/${DROPIN_NAME}.conf + + # install udev rules + install -d ${D}${sysconfdir}/udev/rules.d + for f in ${files}; do + g=${f%.in} + h=${g%.rules} + if [ "${g}" != "${h}" ]; then + install -m644 ${WORKDIR}/${g} ${D}${sysconfdir}/udev/rules.d + fi + done } -FILES_${PN} += "${libdir}/tmpfiles.d/*.conf" +FILES_${PN} += " \ + ${libdir}/tmpfiles.d/*.conf \ + ${systemd_system_unitdir}/weston.service.d/${DROPIN_NAME}.conf \ +" diff --git a/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston_tmpfiles.conf b/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/tmpfiles.conf.in index c4b302fa..c4b302fa 100644 --- a/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston_tmpfiles.conf +++ b/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/tmpfiles.conf.in diff --git a/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston.service.add b/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston.conf.in index d24a8eb2..89c43669 100644 --- a/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston.service.add +++ b/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston.conf.in @@ -1,8 +1,14 @@ +[Unit] +Conflicts=getty@tty@WESTONTTY@.service +[Service] Type=notify +User=@WESTONUSER@ +Group=@WESTONGROUP@ Environment="XDG_RUNTIME_DIR=@XDG_RUNTIME_DIR@" Environment="XDG_RUNTIMESHARE_DIR=@XDG_RUNTIME_DIR@/share" ExecStartPre=/bin/mkdir -p @XDG_RUNTIME_DIR@/share ExecStartPre=+/usr/bin/chsmack -a User::App-Shared -t @XDG_RUNTIME_DIR@/share +ExecStart=@WESTONSTART@ TTYPath=/dev/tty@WESTONTTY@ StandardInput=tty TTYReset=yes diff --git a/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-dri-imx.rules.in b/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-dri-imx.rules.in new file mode 100644 index 00000000..585db6be --- /dev/null +++ b/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-dri-imx.rules.in @@ -0,0 +1,2 @@ +SUBSYSTEM=="gpu_class", MODE="0660", GROUP="@WESTONGROUP@", SECLABEL{smack}="*" + diff --git a/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-dri.rules.in b/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-dri.rules.in new file mode 100644 index 00000000..707d12e2 --- /dev/null +++ b/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-dri.rules.in @@ -0,0 +1 @@ +SUBSYSTEM=="drm", MODE="0660", GROUP="@WESTONGROUP@", SECLABEL{smack}="*", TAG+="systemd", ENV{SYSTEMD_WANTS}="weston.service" diff --git a/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-input.rules b/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-input.rules new file mode 100644 index 00000000..c0842135 --- /dev/null +++ b/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-input.rules @@ -0,0 +1 @@ +SUBSYSTEM=="input", MODE="0660", GROUP="input", SECLABEL{smack}="*", TAG+="systemd", ENV{SYSTEMD_WANTS}="weston.service" diff --git a/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-tty.rules.in b/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-tty.rules.in new file mode 100644 index 00000000..bfdf55b8 --- /dev/null +++ b/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/zz-tty.rules.in @@ -0,0 +1 @@ +SUBSYSTEM=="tty", KERNEL=="tty@WESTONTTY@", OWNER="@WESTONUSER@", SECLABEL{smack}="*", TAG+="systemd", ENV{SYSTEMD_WANTS}="weston.service" diff --git a/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0001-config-parser-Export-get_full_path-and-destroy.patch b/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0001-config-parser-Export-get_full_path-and-destroy.patch new file mode 100644 index 00000000..9dbd7a74 --- /dev/null +++ b/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0001-config-parser-Export-get_full_path-and-destroy.patch @@ -0,0 +1,36 @@ +From 40ff644ac4da90c5cf5239c6ee6051d9bb2b099a Mon Sep 17 00:00:00 2001 +From: Daniel Stone <daniels@collabora.com> +Date: Mon, 25 Nov 2019 10:30:11 +0000 +Subject: [PATCH] config-parser: Export get_full_path and destroy + +Make sure we export the get_full_path() accessor (declared in the +header, used by Weston itself) and the parser's destroy function. + +Signed-off-by: Daniel Stone <daniels@collabora.com> +--- + shared/config-parser.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/shared/config-parser.c b/shared/config-parser.c +index 35f09f006..94eb24cc1 100644 +--- a/shared/config-parser.c ++++ b/shared/config-parser.c +@@ -470,6 +470,7 @@ weston_config_parse(const char *name) + return config; + } + ++WL_EXPORT + const char * + weston_config_get_full_path(struct weston_config *config) + { +@@ -500,6 +501,7 @@ weston_config_next_section(struct weston_config *config, + return 1; + } + ++WL_EXPORT + void + weston_config_destroy(struct weston_config *config) + { +-- +2.21.0 + diff --git a/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0002-compositor-add-output-type-to-weston_output.patch b/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0002-compositor-add-output-type-to-weston_output.patch deleted file mode 100644 index 187bea50..00000000 --- a/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0002-compositor-add-output-type-to-weston_output.patch +++ /dev/null @@ -1,202 +0,0 @@ -From e31e63976aab7616319c10ad21c998c3b4c634e6 Mon Sep 17 00:00:00 2001 -From: Veeresh Kadasani <external.vkadasani@jp.adit-jv.com> -Date: Tue, 30 Jul 2019 20:22:15 +0900 -Subject: [PATCH 1/2] compositor: add output type to weston_output - -This enables weston to use multiple types of backend -Each backends have own output structure for each functions -To avoid invalid member access, type identifier is needed - -Signed-off-by: Veeresh Kadasani <external.vkadasani@jp.adit-jv.com> ---- - libweston/compositor-drm.c | 12 +++++++++++- - libweston/compositor-fbdev.c | 2 +- - libweston/compositor-headless.c | 2 +- - libweston/compositor-rdp.c | 2 +- - libweston/compositor-wayland.c | 2 +- - libweston/compositor-x11.c | 2 +- - libweston/compositor.h | 12 ++++++++++++ - 7 files changed, 28 insertions(+), 6 deletions(-) - -diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c -index c110110..b83459a 100644 ---- a/libweston/compositor-drm.c -+++ b/libweston/compositor-drm.c -@@ -923,6 +923,7 @@ drm_output_find_by_crtc(struct drm_backend *b, uint32_t crtc_id) - struct drm_output *output; - - wl_list_for_each(output, &b->compositor->output_list, base.link) { -+ if(output->base.output_type == OUTPUT_DRM) - if (output->crtc_id == crtc_id) - return output; - } -@@ -939,6 +940,7 @@ drm_head_find_by_connector(struct drm_backend *backend, uint32_t connector_id) - wl_list_for_each(base, - &backend->compositor->head_list, compositor_link) { - head = to_drm_head(base); -+ if(base->output->output_type == OUTPUT_DRM) - if (head->connector_id == connector_id) - return head; - } -@@ -6159,6 +6161,7 @@ drm_output_enable(struct weston_output *base) - - assert(!output->virtual); - -+ output->base.output_type = OUTPUT_DRM; - resources = drmModeGetResources(b->drm.fd); - if (!resources) { - weston_log("drmModeGetResources failed\n"); -@@ -6628,6 +6631,7 @@ drm_backend_update_heads(struct drm_backend *b, struct udev_device *drm_device) - /* Remove connectors that have disappeared. */ - wl_list_for_each_safe(base, next, - &b->compositor->head_list, compositor_link) { -+ if (base->output->output_type == OUTPUT_DRM) { - bool removed = true; - - head = to_drm_head(base); -@@ -6646,6 +6650,7 @@ drm_backend_update_heads(struct drm_backend *b, struct udev_device *drm_device) - head->base.name, head->connector_id); - drm_head_destroy(head); - } -+ } - - drm_backend_update_unused_outputs(b, resources); - -@@ -6751,12 +6756,14 @@ session_notify(struct wl_listener *listener, void *data) - * pending frame callbacks. */ - - wl_list_for_each(output, &compositor->output_list, base.link) { -+ if(output->base.output_type == OUTPUT_DRM) { - output->base.repaint_needed = false; - if (output->cursor_plane) - drmModeSetCursor(b->drm.fd, output->crtc_id, - 0, 0, 0); - } -- -+ } -+ if(output->base.output_type == OUTPUT_DRM) { - output = container_of(compositor->output_list.next, - struct drm_output, base.link); - -@@ -6768,6 +6775,7 @@ session_notify(struct wl_listener *listener, void *data) - plane->plane_id, - output->crtc_id, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0); -+ } - } - } - } -@@ -7094,6 +7102,7 @@ switch_to_gl_renderer(struct drm_backend *b) - } - - wl_list_for_each(output, &b->compositor->output_list, base.link) -+ if(output->base.output_type == OUTPUT_DRM) - pixman_renderer_output_destroy(&output->base); - - b->compositor->renderer->destroy(b->compositor); -@@ -7106,6 +7115,7 @@ switch_to_gl_renderer(struct drm_backend *b) - } - - wl_list_for_each(output, &b->compositor->output_list, base.link) -+ if(output->base.output_type == OUTPUT_DRM) - drm_output_init_egl(output, b); - - b->use_pixman = 0; -diff --git a/libweston/compositor-fbdev.c b/libweston/compositor-fbdev.c -index 6031be5..97002e6 100644 ---- a/libweston/compositor-fbdev.c -+++ b/libweston/compositor-fbdev.c -@@ -526,7 +526,7 @@ fbdev_output_enable(struct weston_output *base) - struct fbdev_head *head; - int fb_fd; - struct wl_event_loop *loop; -- -+ output->base.output_type = OUTPUT_FBDEV; - head = fbdev_output_get_head(output); - - /* Create the frame buffer. */ -diff --git a/libweston/compositor-headless.c b/libweston/compositor-headless.c -index 5a0e46c..20b78b2 100644 ---- a/libweston/compositor-headless.c -+++ b/libweston/compositor-headless.c -@@ -160,7 +160,7 @@ headless_output_enable(struct weston_output *base) - loop = wl_display_get_event_loop(b->compositor->wl_display); - output->finish_frame_timer = - wl_event_loop_add_timer(loop, finish_frame_handler, output); -- -+ output->base.output_type = OUTPUT_HEADLESS; - if (b->use_pixman) { - output->image_buf = malloc(output->base.current_mode->width * - output->base.current_mode->height * 4); -diff --git a/libweston/compositor-rdp.c b/libweston/compositor-rdp.c -index 871a0a3..b3064dd 100644 ---- a/libweston/compositor-rdp.c -+++ b/libweston/compositor-rdp.c -@@ -554,7 +554,7 @@ rdp_output_enable(struct weston_output *base) - struct rdp_output *output = to_rdp_output(base); - struct rdp_backend *b = to_rdp_backend(base->compositor); - struct wl_event_loop *loop; -- -+ output->base.output_type = OUTPUT_RDP; - output->shadow_surface = pixman_image_create_bits(PIXMAN_x8r8g8b8, - output->base.current_mode->width, - output->base.current_mode->height, -diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c -index e1485ca..75140b2 100644 ---- a/libweston/compositor-wayland.c -+++ b/libweston/compositor-wayland.c -@@ -1221,7 +1221,7 @@ wayland_output_enable(struct weston_output *base) - struct wayland_backend *b = to_wayland_backend(base->compositor); - enum mode_status mode_status; - int ret = 0; -- -+ output->base.output_type = OUTPUT_WAYLAND; - weston_log("Creating %dx%d wayland output at (%d, %d)\n", - output->base.current_mode->width, - output->base.current_mode->height, -diff --git a/libweston/compositor-x11.c b/libweston/compositor-x11.c -index 922e3c8..8c20626 100644 ---- a/libweston/compositor-x11.c -+++ b/libweston/compositor-x11.c -@@ -934,7 +934,7 @@ x11_output_enable(struct weston_output *base) - XCB_EVENT_MASK_STRUCTURE_NOTIFY, - 0 - }; -- -+ output->base.output_type = OUTPUT_X11; - if (!b->no_input) - values[0] |= - XCB_EVENT_MASK_KEY_PRESS | -diff --git a/libweston/compositor.h b/libweston/compositor.h -index a5223c2..040917b 100644 ---- a/libweston/compositor.h -+++ b/libweston/compositor.h -@@ -169,6 +169,17 @@ enum dpms_enum { - WESTON_DPMS_OFF - }; - -+/* bit compatible with drm definitions. */ -+enum output_type { -+ OUTPUT_DRM, -+ OUTPUT_FBDEV, -+ OUTPUT_HEADLESS, -+ OUTPUT_RDP, -+ OUTPUT_WAYLAND, -+ OUTPUT_X11, -+ OUTPUT_WALTHAM -+}; -+ - /** Represents a monitor - * - * This object represents a monitor (hardware backends like DRM) or a window -@@ -202,6 +213,7 @@ struct weston_head { - struct weston_output { - uint32_t id; - char *name; -+ enum output_type output_type; - - /** Matches the lifetime from the user perspective */ - struct wl_signal user_destroy_signal; --- -2.7.4 - diff --git a/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0002-ivi-shell-Fix-crash-due-no-transmitter-screen.patch b/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0002-ivi-shell-Fix-crash-due-no-transmitter-screen.patch new file mode 100644 index 00000000..51779cf4 --- /dev/null +++ b/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0002-ivi-shell-Fix-crash-due-no-transmitter-screen.patch @@ -0,0 +1,264 @@ +From e1fd1c9fc08b9e1b8a2f2d958ce591bb8d256b84 Mon Sep 17 00:00:00 2001 +From: Veeresh Kadasani <external.vkadasani@jp.adit-jv.com> +Date: Mon, 16 Dec 2019 19:24:15 +0900 +Subject: [PATCH 1/1] ivi-shell: Fix crash due no transmitter screen + +Registered the events for the output_created, destroyed, +resized events.So that the ivi_scrn can be destroyed, +created dynamically during destroyed and created events. +And the view properties are dynamically changed during +resized/moved events. + +Signed-off-by: Veeresh Kadasani <external.vkadasani@jp.adit-jv.com> +--- + ivi-shell/ivi-layout-private.h | 5 ++ + ivi-shell/ivi-layout.c | 154 ++++++++++++++++++++++++++++++++++++----- + 2 files changed, 140 insertions(+), 19 deletions(-) + +diff --git a/ivi-shell/ivi-layout-private.h b/ivi-shell/ivi-layout-private.h +index c054130..8997edd 100644 +--- a/ivi-shell/ivi-layout-private.h ++++ b/ivi-shell/ivi-layout-private.h +@@ -113,6 +113,11 @@ struct ivi_layout { + + struct ivi_layout_transition_set *transitions; + struct wl_list pending_transition_list; /* transition_node::link */ ++ ++ struct wl_listener output_created; ++ struct wl_listener output_destroyed; ++ struct wl_listener output_resized; ++ struct wl_listener output_moved; + }; + + struct ivi_layout *get_instance(void); +diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c +index 2c450f3..1fbfeeb 100644 +--- a/ivi-shell/ivi-layout.c ++++ b/ivi-shell/ivi-layout.c +@@ -67,7 +67,7 @@ + #include "ivi-layout-export.h" + #include "ivi-layout-private.h" + #include "ivi-layout-shell.h" +- ++#include "plugin-registry.h" + #include "shared/helpers.h" + #include "shared/os-compatibility.h" + +@@ -259,6 +259,87 @@ ivi_layout_surface_destroy(struct ivi_layout_surface *ivisurf) + free(ivisurf); + } + ++ ++static void ++destroy_screen(struct ivi_layout_screen *iviscrn) ++{ ++ struct ivi_layout_layer *ivilayer; ++ struct ivi_layout_layer *next; ++ ++ /*we need to remove the layers from pending and order lists ++ *otherwise the memory will be corrupted during the ++ *wl_list_remove of pending.link or order.link from ++ *ivi_layout_screen_add_layer() or commit_screen_list() ++ *and on_screen has to be set as NULL otherwise the commit_changes() ++ *API will try to refer the freed iviscrn*/ ++ wl_list_for_each_safe(ivilayer, next, &iviscrn->pending.layer_list, pending.link) { ++ wl_list_remove(&ivilayer->pending.link); ++ wl_list_init(&ivilayer->pending.link); ++ ivilayer->on_screen = NULL; ++ } ++ ++ wl_list_for_each_safe(ivilayer, next, &iviscrn->order.layer_list, order.link) { ++ wl_list_remove(&ivilayer->order.link); ++ wl_list_init(&ivilayer->order.link); ++ ivilayer->on_screen = NULL; ++ } ++ ++ wl_list_init(&iviscrn->pending.layer_list); ++ wl_list_init(&iviscrn->order.layer_list); ++ ++ wl_list_remove(&iviscrn->link); ++ free(iviscrn); ++} ++ ++static void ++output_destroyed_event(struct wl_listener *listener, void *data) ++{ ++ struct ivi_layout *layout = ++ wl_container_of(listener, layout, output_destroyed); ++ struct ivi_layout_screen *iviscrn = NULL; ++ struct ivi_layout_screen *next = NULL; ++ struct weston_output *destroyed_output = (struct weston_output*)data; ++ ++ wl_list_for_each_safe(iviscrn, next, &layout->screen_list, link) { ++ if (iviscrn->output == destroyed_output) { ++ destroy_screen(iviscrn); ++ } ++ } ++ ivi_layout_commit_changes(); ++} ++ ++static void ++add_screen(struct weston_output *output) ++{ ++ struct ivi_layout *layout = get_instance(); ++ struct ivi_layout_screen *iviscrn = NULL; ++ ++ if(!output) ++ return; ++ ++ iviscrn = calloc(1, sizeof *iviscrn); ++ if (iviscrn == NULL) { ++ weston_log("fails to allocate memory\n"); ++ return; ++ } ++ ++ iviscrn->layout = layout; ++ iviscrn->output = output; ++ ++ wl_list_init(&iviscrn->pending.layer_list); ++ wl_list_init(&iviscrn->order.layer_list); ++ wl_list_insert(&layout->screen_list, &iviscrn->link); ++} ++ ++static void ++output_created_event(struct wl_listener *listener, void *data) ++{ ++ struct weston_output *created_output = (struct weston_output*)data; ++ ++ add_screen(created_output); ++ ivi_layout_commit_changes(); ++} ++ + /** + * Internal API to initialize ivi_screens found from output_list of weston_compositor. + * Called by ivi_layout_init_with_compositor. +@@ -266,27 +347,14 @@ ivi_layout_surface_destroy(struct ivi_layout_surface *ivisurf) + static void + create_screen(struct weston_compositor *ec) + { ++ + struct ivi_layout *layout = get_instance(); + struct ivi_layout_screen *iviscrn = NULL; +- struct weston_output *output = NULL; +- +- wl_list_for_each(output, &ec->output_list, link) { +- iviscrn = calloc(1, sizeof *iviscrn); +- if (iviscrn == NULL) { +- weston_log("fails to allocate memory\n"); +- continue; +- } + +- iviscrn->layout = layout; +- +- iviscrn->output = output; +- +- wl_list_init(&iviscrn->pending.layer_list); +- +- wl_list_init(&iviscrn->order.layer_list); ++ struct weston_output *output = NULL; + +- wl_list_insert(&layout->screen_list, &iviscrn->link); +- } ++ wl_list_for_each(output, &ec->output_list, link) ++ add_screen(output); + } + + /** +@@ -822,7 +890,18 @@ build_view_list(struct ivi_layout *layout) + if (!ivi_view_is_mapped(ivi_view)) + weston_view_unmap(ivi_view->view); + } ++ struct weston_view *view = NULL; ++ struct weston_view *view_next = NULL; + ++ /* Earlier only the head node was reset, but the remaining links ++ * won't be changed. Due to this, faced crash issue (or sometimes ++ * list was looping) in weston_view_destroy API. So clearing the ++ * entire list*/ ++ wl_list_for_each_safe(view, view_next, ++ &layout->layout_layer.view_list.link, layer_link.link) { ++ wl_list_remove(&view->layer_link.link); ++ wl_list_init(&view->layer_link.link); ++ } + /* Clear view list of layout ivi_layer */ + wl_list_init(&layout->layout_layer.view_list.link); + +@@ -1791,7 +1870,22 @@ ivi_layout_commit_changes(void) + + return IVI_SUCCEEDED; + } ++static void ++output_resized_moved_events(struct wl_listener *listener, void *data) ++{ ++ struct ivi_layout_screen *iviscrn = NULL; ++ struct ivi_layout_layer *ivilayer; ++ struct ivi_layout_view *ivi_view; ++ struct weston_output *output = (struct weston_output*)data; + ++ iviscrn = get_screen_from_output(output); ++ ++ wl_list_for_each(ivilayer, &iviscrn->order.layer_list, order.link) { ++ wl_list_for_each(ivi_view, &ivilayer->order.view_list, ++ order_link) ++ update_prop(ivi_view); ++ } ++} + static int32_t + ivi_layout_layer_set_transition(struct ivi_layout_layer *ivilayer, + enum ivi_layout_transition_type type, +@@ -1931,6 +2025,14 @@ surface_create(struct weston_surface *wl_surface, uint32_t id_surface) + return NULL; + } + ++ ivisurf = get_surface(&layout->surface_list, id_surface); ++ if (ivisurf != NULL) { ++ if (ivisurf->surface != NULL) { ++ weston_log("id_surface(%d) is already created\n", id_surface); ++ return NULL; ++ } ++ } ++ + ivisurf = calloc(1, sizeof *ivisurf); + if (ivisurf == NULL) { + weston_log("fails to allocate memory\n"); +@@ -1954,6 +2056,8 @@ surface_create(struct weston_surface *wl_surface, uint32_t id_surface) + + wl_list_insert(&layout->surface_list, &ivisurf->link); + ++ wl_signal_emit(&layout->surface_notification.created, ivisurf); ++ + return ivisurf; + } + +@@ -2006,8 +2110,8 @@ ivi_layout_surface_create(struct weston_surface *wl_surface, + return ivisurf; + } + +-static struct ivi_layout_interface ivi_layout_interface; + ++static struct ivi_layout_interface ivi_layout_interface; + void + ivi_layout_init_with_compositor(struct weston_compositor *ec) + { +@@ -2035,6 +2139,18 @@ ivi_layout_init_with_compositor(struct weston_compositor *ec) + + create_screen(ec); + ++ layout->output_created.notify = output_created_event; ++ wl_signal_add(&ec->output_created_signal, &layout->output_created); ++ ++ layout->output_destroyed.notify = output_destroyed_event; ++ wl_signal_add(&ec->output_destroyed_signal, &layout->output_destroyed); ++ ++ layout->output_resized.notify = output_resized_moved_events; ++ wl_signal_add(&ec->output_resized_signal, &layout->output_resized); ++ ++ layout->output_moved.notify = output_resized_moved_events; ++ wl_signal_add(&ec->output_moved_signal, &layout->output_moved); ++ + layout->transitions = ivi_layout_transition_set_create(ec); + wl_list_init(&layout->pending_transition_list); + +-- +2.7.4 + diff --git a/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston_6.0.0.bbappend b/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston_6.0.0.bbappend index 44fcdcb0..67442bd6 100644 --- a/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston_6.0.0.bbappend +++ b/meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston_6.0.0.bbappend @@ -3,8 +3,8 @@ FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" SRC_URI_append = "\ file://0001-Allow-regular-users-to-launch-Weston_2.0.0.patch \ file://use-XDG_RUNTIMESHARE_DIR.patch \ - file://0002-compositor-add-output-type-to-weston_output.patch \ + file://0002-ivi-shell-Fix-crash-due-no-transmitter-screen.patch \ file://0003-compositor-drm-introduce-drm_get_dmafd_from_view.patch \ + file://0001-config-parser-Export-get_full_path-and-destroy.patch \ " - EXTRA_OECONF_append = " --enable-sys-uid" diff --git a/meta-agl/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb b/meta-agl/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb index 53721f0d..a97b6ebe 100644 --- a/meta-agl/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb +++ b/meta-agl/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb @@ -17,5 +17,6 @@ RDEPENDS_${PN} += " \ weston-ready \ agl-login-manager \ agl-desktop-config \ + agl-compositor \ " diff --git a/meta-agl/meta-app-framework/conf/include/agl-appfw-smack.inc b/meta-agl/meta-app-framework/conf/include/agl-appfw-smack.inc index b6b998a9..b91ed64a 100644 --- a/meta-agl/meta-app-framework/conf/include/agl-appfw-smack.inc +++ b/meta-agl/meta-app-framework/conf/include/agl-appfw-smack.inc @@ -1,4 +1,4 @@ -# enable security features (smack, cynara) - required by Application Framework +# enable security features (smack, cynagora) - required by Application Framework OVERRIDES .= ":with-lsm-smack" DISTRO_FEATURES_append = " smack xattr" diff --git a/meta-agl/meta-app-framework/recipes-core/af-binder/af-binder_git.inc b/meta-agl/meta-app-framework/recipes-core/af-binder/af-binder_git.inc index 1077e558..ffe4765e 100644 --- a/meta-agl/meta-app-framework/recipes-core/af-binder/af-binder_git.inc +++ b/meta-agl/meta-app-framework/recipes-core/af-binder/af-binder_git.inc @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/app-framework-binder;protocol=https;branch=${AGL_BRANCH}" -SRCREV = "99ad30bf29c683da833efeac42d8f178b6d2ca8c" +SRCREV = "b15edc1c48d74f2ad6e9ade577bf6b4945d85eee" PV = "${AGL_BRANCH}+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-agl/meta-app-framework/recipes-core/af-main/af-main/Hack-to-allow-the-debugging.patch b/meta-agl/meta-app-framework/recipes-core/af-main/af-main/Hack-to-allow-the-debugging.patch deleted file mode 100644 index 14a26fbe..00000000 --- a/meta-agl/meta-app-framework/recipes-core/af-main/af-main/Hack-to-allow-the-debugging.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a4fbfb88f1b7c4f4287d9279767220fae80d26da Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh> -Date: Thu, 21 Jan 2016 15:07:29 +0100 -Subject: [PATCH] Hack to allow the debugging - -This is a temporarily fix to continue debugging -afm-main. This should be removed later. - -Change-Id: I2f10f0cb1fce2ee30bd0754ad2e7bc8e2f6513aa ---- - conf/afm-user-daemon.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/conf/user/afm-user-daemon.conf b/conf/user/afm-user-daemon.conf -index 801c7ae..98a3152 100644 ---- a/conf/user/afm-user-daemon.conf -+++ b/conf/user/afm-user-daemon.conf -@@ -25,7 +25,7 @@ - </policy> - - <policy context="default"> -- <deny own="org.AGL.afm.user"/> -+ <allow own="org.AGL.afm.user"/> - <allow send_destination="org.AGL.afm.system"/> - </policy> - --- -2.1.4 - diff --git a/meta-agl/meta-app-framework/recipes-core/af-main/af-main_git.bb b/meta-agl/meta-app-framework/recipes-core/af-main/af-main_git.bb index 4a565453..66b93db5 100644 --- a/meta-agl/meta-app-framework/recipes-core/af-main/af-main_git.bb +++ b/meta-agl/meta-app-framework/recipes-core/af-main/af-main_git.bb @@ -12,7 +12,7 @@ SECTION = "base" DEPENDS = "openssl libxml2 xmlsec1 systemd libzip json-c systemd security-manager af-binder sed m4" DEPENDS_class-native = "openssl libxml2 xmlsec1 libzip json-c" -RDEPENDS_${PN}_class-target += "af-binder-tools" +RDEPENDS_${PN}_class-target += "af-binder-tools nss-localuser cynagoauth" PACKAGE_WRITE_DEPS_append_with-lsm-smack = " smack-native libcap-native" @@ -68,11 +68,6 @@ GROUPADD_PARAM_${PN} = "--system ${afm_name}" RDEPENDS_${PN}_append_with-lsm-smack = " smack bash" DEPENDS_append_with-lsm-smack = " smack-native" -# short hacks here -SRC_URI += "\ - file://Hack-to-allow-the-debugging.patch \ -" - do_install_append_class-target() { install -d ${D}${bindir} install -d -m 0775 ${D}${systemd_units_root}/system @@ -90,7 +85,9 @@ do_install_append_class-target() { ln -sf ../afm-system-daemon.service ${D}${systemd_system_unitdir}/multi-user.target.wants/afm-system-daemon.service ln -sf ../afm-system-daemon.socket ${D}${systemd_system_unitdir}/sockets.target.wants/afm-system-daemon.socket fi - echo "QT_WAYLAND_SHELL_INTEGRATION=ivi-shell" > ${D}${afm_confdir}/unit.env.d/qt-for-ivi-shell + + DEFAULT_WM_SHELL="${@bb.utils.contains('DISTRO_FEATURES', 'agl-compositor', 'xdg-shell-v6', 'ivi-shell', d)}" + echo "QT_WAYLAND_SHELL_INTEGRATION=${DEFAULT_WM_SHELL}" > ${D}${afm_confdir}/unit.env.d/qt-shell } pkg_postinst_ontarget_${PN}() { diff --git a/meta-agl/meta-app-framework/recipes-core/af-main/af-main_git.inc b/meta-agl/meta-app-framework/recipes-core/af-main/af-main_git.inc index 6795da2a..df06df63 100644 --- a/meta-agl/meta-app-framework/recipes-core/af-main/af-main_git.inc +++ b/meta-agl/meta-app-framework/recipes-core/af-main/af-main_git.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/app-framework-main;protocol=https;branch=${AGL_BRANCH}" -SRCREV = "533d5a1a51a07f2f92e508d113cb49d373e1bad8" +SRCREV = "381a0973c9d421bc031882cecce9244f6d2a6638" PV = "${AGL_BRANCH}+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-agl/meta-app-framework/recipes-core/nss-localuser/nss-localuser_0.1.bb b/meta-agl/meta-app-framework/recipes-core/nss-localuser/nss-localuser_0.1.bb index 148bc516..62e163f9 100644 --- a/meta-agl/meta-app-framework/recipes-core/nss-localuser/nss-localuser_0.1.bb +++ b/meta-agl/meta-app-framework/recipes-core/nss-localuser/nss-localuser_0.1.bb @@ -10,7 +10,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=79ad77111c398994735201536a4749ba" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/nss-localuser;protocol=https;branch=${AGL_BRANCH}" -SRCREV = "d2d9e83bd9bdc3a091d6b9f1ccaec012fba2f0f4" +SRCREV = "66803c6fdb609ed83a78b9194ecb23e9c1b773e7" PV = "${AGL_BRANCH}+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-agl/meta-app-framework/recipes-core/security-manager/security-manager/init-security-manager-db.service b/meta-agl/meta-app-framework/recipes-core/security-manager/security-manager/init-security-manager-db.service deleted file mode 100644 index 8ed5e860..00000000 --- a/meta-agl/meta-app-framework/recipes-core/security-manager/security-manager/init-security-manager-db.service +++ /dev/null @@ -1,15 +0,0 @@ -# -# Install security-manager DB to /var - -[Unit] -Description=Install Security Manager database -After=sysinit.target -Before=security-manager.service - -[Install] -WantedBy=default.target - -[Service] -Type=oneshot -User=root -ExecStart=/usr/bin/init-security-manager-db.sh diff --git a/meta-agl/meta-app-framework/recipes-core/security-manager/security-manager/init-security-manager-db.sh b/meta-agl/meta-app-framework/recipes-core/security-manager/security-manager/init-security-manager-db.sh deleted file mode 100644 index f90192a8..00000000 --- a/meta-agl/meta-app-framework/recipes-core/security-manager/security-manager/init-security-manager-db.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if [ ! -e "/var/local/db/security-manager" ]; then - mkdir -p /var/local/db - cp -ra /usr/dbspace/ /var/local/db/security-manager -fi diff --git a/meta-agl/meta-app-framework/recipes-core/security-manager/security-manager_%.bbappend b/meta-agl/meta-app-framework/recipes-core/security-manager/security-manager_%.bbappend index 61c933a7..3306d4c7 100644 --- a/meta-agl/meta-app-framework/recipes-core/security-manager/security-manager_%.bbappend +++ b/meta-agl/meta-app-framework/recipes-core/security-manager/security-manager_%.bbappend @@ -1,25 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/security-manager:" -PACKAGE_WRITE_DEPS_append_with-lsm-smack = " smack-native" - -SRC_URI += " file://0001-Adapt-rules-to-AGL.patch \ - file://init-security-manager-db.service \ - file://init-security-manager-db.sh \ - file://0001-Fix-gcc6-build.patch \ - file://0001-Fix-Cmake-conf-for-gcc6-build.patch \ - file://0001-gcc-7-requires-include-functional-for-std-function.patch \ -" - -FILES_${PN}_append = "${bindir}/init-security-manager-db.sh \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/init-security-manager-db.service', '', d)} \ +EXTRA_OECMAKE =+ " -DGLOBALUSER=afm" +SRC_URI += " \ + file://0001-Adapt-rules-to-AGL.patch \ " -do_install_append () { - install -p -D ${WORKDIR}/init-security-manager-db.sh ${D}${bindir}/init-security-manager-db.sh - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - mkdir -p ${D}${systemd_unitdir}/system - mkdir -p ${D}${sysconfdir}/systemd/system/default.target.wants - install -m 644 -p -D ${WORKDIR}/init-security-manager-db.service ${D}${systemd_unitdir}/system/init-security-manager-db.service - ln -sf ${systemd_unitdir}/system/init-security-manager-db.service ${D}${sysconfdir}/systemd/system/default.target.wants - fi -} diff --git a/meta-agl/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-core-security.bbappend b/meta-agl/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-core-security.bbappend index 19af9117..8445a9ed 100644 --- a/meta-agl/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-core-security.bbappend +++ b/meta-agl/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-core-security.bbappend @@ -1,7 +1,7 @@ RDEPENDS_${PN} += "\ smack-system-setup \ xmlsec1 \ - cynara \ + cynagora \ security-manager \ security-manager-policy \ agl-users \ diff --git a/meta-agl/meta-app-framework/recipes-security/security-manager/security-manager_git.bbappend b/meta-agl/meta-app-framework/recipes-security/security-manager/security-manager_git.bbappend deleted file mode 100644 index 424b4935..00000000 --- a/meta-agl/meta-app-framework/recipes-security/security-manager/security-manager_git.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -do_patch[depends] += "quilt-native:do_populate_sysroot libcap:do_populate_sysroot" -APPLY = "no" diff --git a/meta-agl/meta-netboot/README b/meta-agl/meta-netboot/README index b571186b..dc545b2f 100644 --- a/meta-agl/meta-netboot/README +++ b/meta-agl/meta-netboot/README @@ -8,11 +8,20 @@ Content and usage This layer creates a new supplementary initrd image which can be downloaded through TFTP with the kernel. At boot time, the init script will try to mount the rootfs based on the following kernel command line parameters: + * nbd.server: IP address to reach the NBD server -* nbd.port: TCP port on which server is listening (default: 10809) * nbd.dev: nbd device to use (default: /dev/nbd0) * nbd.debug: activate debug mode (init script is then interruptible) +For nbd v2: + +* nbd.port: TCP port on which server is listening (default: 10809) + +For nbd v3: + +* nbd.namev3: The name of the image served by nbd-server. + + The layer meta-netboot contains recipes for the following components: * busybox: activate the built-in NBD client * initramfs-netboot: contains the init script started by the kernel: basically, this script mounts the real root filesystem, then pivot_root on it and finally exec systemd. diff --git a/meta-agl/meta-netboot/classes/netboot.bbclass b/meta-agl/meta-netboot/classes/netboot.bbclass index 363e6bcc..63369285 100644 --- a/meta-agl/meta-netboot/classes/netboot.bbclass +++ b/meta-agl/meta-netboot/classes/netboot.bbclass @@ -1,22 +1,22 @@ # Enable network bootable image and initrd/initramfs python () { - if (bb.utils.contains_any("IMAGE_FSTYPES",["live","wic.vmdk"],True,False,d)): - # typical case for Minnowboard Max - d.setVar("INITRD_IMAGE","initramfs-netboot-image") - d.setVar("INITRD_IMAGE_LIVE",d.getVar("INITRD_IMAGE",True)) - d.setVar("INITRD_LIVE","%s/%s-%s.ext4.gz" % ( - d.getVar("DEPLOY_DIR_IMAGE",True), - d.getVar("INITRD_IMAGE_LIVE",True), - d.getVar("MACHINE",True) - )) - else: - d.setVar("INITRAMFS_IMAGE","initramfs-netboot-image") - if (d.getVar("KERNEL_IMAGETYPE",True) == "uImage"): - # case for "old" u-boot images, like Porter board - d.setVar("NETBOOT_FSTYPES", "ext4.gz.u-boot"); - else: - # case for new u-boot images which don't require uImage format - d.setVar("NETBOOT_FSTYPES", "ext4.gz"); + if (bb.utils.contains("IMAGE_FSTYPES","live",True,False,d)): + # typical case for Minnowboard Max + d.setVar("INITRD_IMAGE","initramfs-netboot-image") + d.setVar("INITRD_IMAGE_LIVE",d.getVar("INITRD_IMAGE",True)) + d.setVar("INITRD_LIVE","%s/%s-%s.ext4.gz" % ( + d.getVar("DEPLOY_DIR_IMAGE",True), + d.getVar("INITRD_IMAGE_LIVE",True), + d.getVar("MACHINE",True) + )) + else: + d.setVar("INITRAMFS_IMAGE","initramfs-netboot-image") + if (d.getVar("KERNEL_IMAGETYPE",True) == "uImage"): + # case for "old" u-boot images, like Porter board + d.setVar("NETBOOT_FSTYPES", "ext4.gz.u-boot"); + else: + # case for new u-boot images which don't require uImage format + d.setVar("NETBOOT_FSTYPES", "ext4.gz"); } diff --git a/meta-agl/meta-netboot/recipes-core/initramfs-netboot/files/init.sh b/meta-agl/meta-netboot/recipes-core/initramfs-netboot/files/init.sh index 7b8fbb51..50d62472 100644 --- a/meta-agl/meta-netboot/recipes-core/initramfs-netboot/files/init.sh +++ b/meta-agl/meta-netboot/recipes-core/initramfs-netboot/files/init.sh @@ -57,6 +57,29 @@ check_debug() { esac } +find_active_interface() { + [[ ! -d /sys/class/net ]] && { log_error "find_active_interface: /sys/class/net doesn't exist"; return 2; } + local iface + for x in $(ls -d /sys/class/net/* 2>/dev/null); do + iface=$(basename $x) + # find interfaces with: + # - type == 1 (ethernet) + # - not wireless + # - with state up + + [[ $(cat $x/type) != 1 ]] && continue + [[ -d $x/wireless ]] && continue + [[ $(cat $x/operstate) != "up" ]] && continue + + log_info "find_active_interface: first active interface is $iface" + echo $iface + return 0 + done + + log_error "Unable to find any active network interface." + return 1 +} + # ------------------------------------------- export PATH=/sbin:/usr/sbin:/bin:/usr/bin @@ -131,9 +154,12 @@ pivot_root . boot/initramfs || bail_out "pivot_root failed." # workaround for connman (avoid bringing down the network interface used for booting, disable DNS proxy) if [[ -f /lib/systemd/system/connman.service ]]; then - log_info "Adjusting Connman configuration" - iface=$(ip -o link show up | tr ':' ' ' | awk '{print $2}' | grep -v -e "^lo$" | head -1) - sed -i "s|connmand -n\$|connmand -r -n -I $iface|g" /lib/systemd/system/connman.service + newopts="-r -n" + iface=$(find_active_interface) + [[ -n "$iface" ]] && newopts="$newopts -I $iface" + + log_info "Adjusting Connman command line. Will be: 'connmand $newopts'" + sed -i "s|connmand -n\$|connmand $newopts|g" /lib/systemd/system/connman.service fi # also use /proc/net/pnp to generate /etc/resolv.conf diff --git a/meta-agl/meta-security/recipes-core/coreutils/coreutils_%.bbappend b/meta-agl/meta-security/recipes-core/coreutils/coreutils_%.bbappend index ceaf6a29..1b9b722e 100644 --- a/meta-agl/meta-security/recipes-core/coreutils/coreutils_%.bbappend +++ b/meta-agl/meta-security/recipes-core/coreutils/coreutils_%.bbappend @@ -1,7 +1,7 @@ # Smack patches are included in coreutils v8.22, we just need to enable them. # The default is not deterministic (enabled if libsmack found), so disable # explicitly otherwise. -EXTRA_OECONF_SMACK = "--disable-libsmack" -EXTRA_OECONF_SMACK_with-lsm-smack = "--enable-libsmack" -EXTRA_OECONF_append = " ${EXTRA_OECONF_SMACK}" -DEPENDS_append_with-lsm-smack = " smack" +EXTRA_OECONF_SMACK_class-target = "--disable-libsmack" +EXTRA_OECONF_SMACK_with-lsm-smack_class-target = "--enable-libsmack" +EXTRA_OECONF_append_class-target = " ${EXTRA_OECONF_SMACK}" +DEPENDS_append_with-lsm-smack_class-target = " smack" diff --git a/meta-agl/meta-security/recipes-core/dbus-cynara/dbus-cynara/0001-Integration-of-Cynara-asynchronous-security-checks.patch b/meta-agl/meta-security/recipes-core/dbus-cynara/dbus-cynara/0001-Integration-of-Cynara-asynchronous-security-checks.patch index 3dbfa8a8..69d13ac3 100644 --- a/meta-agl/meta-security/recipes-core/dbus-cynara/dbus-cynara/0001-Integration-of-Cynara-asynchronous-security-checks.patch +++ b/meta-agl/meta-security/recipes-core/dbus-cynara/dbus-cynara/0001-Integration-of-Cynara-asynchronous-security-checks.patch @@ -1197,7 +1197,7 @@ index 0000000..57a4c45 + +#define USE_CYNARA_CACHE 1 +#ifdef USE_CYNARA_CACHE -+#define CYNARA_CACHE_SIZE 1000 ++#define CYNARA_CACHE_SIZE 7000 +#endif + +static dbus_bool_t bus_cynara_watch_callback(DBusWatch *watch, diff --git a/meta-agl/meta-security/recipes-core/packagegroups/packagegroup-security-framework.bb b/meta-agl/meta-security/recipes-core/packagegroups/packagegroup-security-framework.bb index 6dd575df..bc708600 100644 --- a/meta-agl/meta-security/recipes-core/packagegroups/packagegroup-security-framework.bb +++ b/meta-agl/meta-security/recipes-core/packagegroups/packagegroup-security-framework.bb @@ -15,7 +15,7 @@ inherit packagegroup # the policy packaged from the upstream source code here. Adapting # it for the distro can be done by patching that source. RDEPENDS_${PN}_append_with-lsm-smack = " \ - cynara \ + cynagora \ security-manager \ security-manager-policy \ smacknet \ diff --git a/meta-agl/meta-security/recipes-kernel/linux/linux/smack.cfg b/meta-agl/meta-security/recipes-kernel/linux/linux/smack.cfg index 62f465a4..45a92f14 100644 --- a/meta-agl/meta-security/recipes-kernel/linux/linux/smack.cfg +++ b/meta-agl/meta-security/recipes-kernel/linux/linux/smack.cfg @@ -5,4 +5,5 @@ CONFIG_EXT3_FS_SECURITY=y CONFIG_EXT4_FS_SECURITY=y CONFIG_SECURITY=y CONFIG_SECURITY_SMACK=y +CONFIG_SECURITY_SMACK_APPEND_SIGNALS=y CONFIG_TMPFS_XATTR=y diff --git a/meta-agl/meta-security/recipes-security/cynagoauth/cynagoauth_0.1.bb b/meta-agl/meta-security/recipes-security/cynagoauth/cynagoauth_0.1.bb new file mode 100644 index 00000000..c77c9918 --- /dev/null +++ b/meta-agl/meta-security/recipes-security/cynagoauth/cynagoauth_0.1.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "OAuth server using cynagora backend" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/cynagoauth.git;protocol=https;branch=${AGL_BRANCH}" +SRCREV = "26a5dbddf3a9bfde481a6fcd2aae16c7ecba665f" +PV = "0.1+git${SRCPV}" + +S = "${WORKDIR}/git" + +DEPENDS = "json-c libmicrohttpd openssl cynagora" + +inherit cmake + +EXTRA_OECMAKE += " \ + -DDEFAULTHOSTS=:7777 \ + -DDEFAULTURL=http://localhost:7777/tok \ + -DUNITDIR_SYSTEM=${systemd_system_unitdir} \ +" + +FILES_${PN} += "${systemd_system_unitdir}" + + diff --git a/meta-agl/meta-security/recipes-security/cynagora/cynagora-cynara-compat_2.0.bb b/meta-agl/meta-security/recipes-security/cynagora/cynagora-cynara-compat_2.0.bb new file mode 100644 index 00000000..fa5cdbad --- /dev/null +++ b/meta-agl/meta-security/recipes-security/cynagora/cynagora-cynara-compat_2.0.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Cynara service with client libraries" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://Apache-2.0;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/cynagora;protocol=https;branch=${AGL_BRANCH}" +SRCREV = "6c88efcb7b1361ba6389753e520e26fc556b7d79" +PV = "2.0+git${SRCPV}" + +S = "${WORKDIR}/git" + +inherit cmake + +PROVIDES = "cynara" +RPROVIDES_${PN} = "cynara" +DEPENDS = "libcap" +RDEPENDS_${PN} = "cynagora" + +EXTRA_OECMAKE += " \ + -DWITH_SYSTEMD=OFF \ + -DWITH_CYNARA_COMPAT=ON \ + -DDIRECT_CYNARA_COMPAT=ON \ +" + +do_install_append() { + # remove cynagora stuff + rm $(find ${D} -name '*cynagora*') + # remove stupid test + rm -r ${D}${bindir} +} + diff --git a/meta-agl/meta-security/recipes-security/cynagora/cynagora/run-ptest b/meta-agl/meta-security/recipes-security/cynagora/cynagora/run-ptest new file mode 100755 index 00000000..f95f0725 --- /dev/null +++ b/meta-agl/meta-security/recipes-security/cynagora/cynagora/run-ptest @@ -0,0 +1,4 @@ +#!/bin/sh + +# test access to cynagora server +cynagora-admin list > /dev/null diff --git a/meta-agl/meta-security/recipes-security/cynagora/cynagora_2.0.bb b/meta-agl/meta-security/recipes-security/cynagora/cynagora_2.0.bb new file mode 100644 index 00000000..fef21c64 --- /dev/null +++ b/meta-agl/meta-security/recipes-security/cynagora/cynagora_2.0.bb @@ -0,0 +1,38 @@ +DESCRIPTION = "Cynagora service and client libraries" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://Apache-2.0;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/cynagora;protocol=https;branch=${AGL_BRANCH}" +SRCREV = "d73ac5e96eeb2f76081af3d944b30ed8e29cac39" +PV = "2.0+git${SRCPV}" + +S = "${WORKDIR}/git" + +DEPENDS = "systemd libcap" + +inherit cmake + +EXTRA_OECMAKE += " \ + -DSYSTEMD_UNIT_DIR=${systemd_system_unitdir} \ + -DWITH_SYSTEMD=ON \ + -DWITH_CYNARA_COMPAT=OFF \ +" + +inherit useradd +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "-r cynagora" +USERADD_PARAM_${PN} = "\ +--system --home ${localstatedir}/lib/empty \ +--no-create-home --shell /bin/false \ +--gid cynagora cynagora \ +" + +FILES_${PN} += "${systemd_system_unitdir}" + +PACKAGES =+ "${PN}-tools" +FILES_${PN}-tools += "${bindir}/cynagora-admin ${bindir}/cynagora-agent" +RDEPENDS_${PN}_append_agl-devel = " ${PN}-tools" + +inherit ptest +SRC_URI_append = " file://run-ptest" +RDEPENDS_${PN}-ptest_append = " ${PN}-tools" diff --git a/meta-agl/meta-security/recipes-security/cynara/cynara/0001-Add-fallthrough-tags.patch b/meta-agl/meta-security/recipes-security/cynara/cynara/0001-Add-fallthrough-tags.patch deleted file mode 100644 index e1d0cfac..00000000 --- a/meta-agl/meta-security/recipes-security/cynara/cynara/0001-Add-fallthrough-tags.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 8bf90bf3e7a821dbd3b7029d87aa592eec6f1754 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh> -Date: Thu, 25 Jan 2018 12:00:18 +0100 -Subject: [PATCH] Add fallthrough tags -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -GCC 7 emits a warning when the tag /*@fallthrough@*/ -doesn't appear in a switch case when a case continue -to the next after some processing. - -Change-Id: I420e3788a4c0a6d910a1214964c5480bbd12708c -Signed-off-by: José Bollo <jose.bollo@iot.bzh> - ---- - src/admin/api/admin-api.cpp | 1 + - src/client-async/logic/Logic.cpp | 1 + - src/common/sockets/SocketClient.cpp | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/src/admin/api/admin-api.cpp b/src/admin/api/admin-api.cpp -index c638f41..aafa45e 100644 ---- a/src/admin/api/admin-api.cpp -+++ b/src/admin/api/admin-api.cpp -@@ -146,6 +146,7 @@ int cynara_admin_set_policies(struct cynara_admin *p_cynara_admin, - case CYNARA_ADMIN_BUCKET: - if (!isStringValid(policy->result_extra)) - return CYNARA_API_INVALID_PARAM; -+ /*@fallthrough@*/ - default: - { - std::string extraStr = policy->result_extra ? policy->result_extra : ""; -diff --git a/src/client-async/logic/Logic.cpp b/src/client-async/logic/Logic.cpp -index 5ae0251..c1d6c33 100644 ---- a/src/client-async/logic/Logic.cpp -+++ b/src/client-async/logic/Logic.cpp -@@ -233,6 +233,7 @@ bool Logic::processOut(void) { - case Socket::SendStatus::ALL_DATA_SENT: - onStatusChange(m_socketClient.getSockFd(), - cynara_async_status::CYNARA_STATUS_FOR_READ); -+ /*@fallthrough@*/ - case Socket::SendStatus::PARTIAL_DATA_SENT: - return true; - default: -diff --git a/src/common/sockets/SocketClient.cpp b/src/common/sockets/SocketClient.cpp -index b1ca4f7..f4394e5 100644 ---- a/src/common/sockets/SocketClient.cpp -+++ b/src/common/sockets/SocketClient.cpp -@@ -45,6 +45,7 @@ bool SocketClient::connect(void) { - LOGW("Error connecting to Cynara. Service not available."); - return false; - } -+ /*@fallthrough@*/ - default: - return true; - } diff --git a/meta-agl/meta-security/recipes-security/cynara/cynara/0001-fix-fallthrough-in-cmdlineparser.patch b/meta-agl/meta-security/recipes-security/cynara/cynara/0001-fix-fallthrough-in-cmdlineparser.patch deleted file mode 100644 index 40e11ce5..00000000 --- a/meta-agl/meta-security/recipes-security/cynara/cynara/0001-fix-fallthrough-in-cmdlineparser.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ca28ec4a0781a1ab9ec5f015387436beb51adfc3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan-Simon=20M=C3=B6ller?= <jsmoeller@linuxfoundation.org> -Date: Fri, 19 Oct 2018 08:09:28 +0000 -Subject: [PATCH] fix fallthrough in cmdlineparser -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> - ---- - src/service/main/CmdlineParser.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/service/main/CmdlineParser.cpp b/src/service/main/CmdlineParser.cpp -index ca56e39..e07ea52 100644 ---- a/src/service/main/CmdlineParser.cpp -+++ b/src/service/main/CmdlineParser.cpp -@@ -112,13 +112,16 @@ struct CmdLineOptions handleCmdlineOptions(int argc, char * const *argv) { - case ':': // Missing argument - ret.m_error = true; - ret.m_exit = true; -+ /*@fallthrough@*/ - switch (optopt) { - case CmdlineOpt::Mask: - case CmdlineOpt::User: - case CmdlineOpt::Group: - printMissingArgument(execName, argv[optind - 1]); - return ret; -+ /*@fallthrough@*/ - } -+ /*@fallthrough@*/ - //intentional fall to Unknown option - case '?': // Unknown option - default: diff --git a/meta-agl/meta-security/recipes-security/cynara/cynara/0002-gcc-7-requires-include-functional-for-std-function.patch b/meta-agl/meta-security/recipes-security/cynara/cynara/0002-gcc-7-requires-include-functional-for-std-function.patch deleted file mode 100644 index b8dbfac4..00000000 --- a/meta-agl/meta-security/recipes-security/cynara/cynara/0002-gcc-7-requires-include-functional-for-std-function.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e2d8414b0d1c6c59baf1bb73e856e93aaabaf955 Mon Sep 17 00:00:00 2001 -From: Changhyeok Bae <changhyeok.bae@gmail.com> -Date: Sun, 17 Dec 2017 15:28:28 +0000 -Subject: [PATCH] gcc-7 requires include <functional> for std::function - -Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com> - ---- - src/common/types/PolicyBucket.h | 1 + - src/cyad/AdminPolicyParser.h | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/common/types/PolicyBucket.h b/src/common/types/PolicyBucket.h -index 029d3dd..1bceeca 100644 ---- a/src/common/types/PolicyBucket.h -+++ b/src/common/types/PolicyBucket.h -@@ -30,6 +30,7 @@ - #include <set> - #include <string> - #include <vector> -+#include <functional> - - #include <exceptions/NotImplementedException.h> - #include <types/pointers.h> -diff --git a/src/cyad/AdminPolicyParser.h b/src/cyad/AdminPolicyParser.h -index 53dde23..f38c194 100644 ---- a/src/cyad/AdminPolicyParser.h -+++ b/src/cyad/AdminPolicyParser.h -@@ -25,6 +25,7 @@ - - #include <istream> - #include <memory> -+#include <functional> - - #include <cyad/CynaraAdminPolicies.h> - diff --git a/meta-agl/meta-security/recipes-security/cynara/cynara/0003-Avoid-warning-when-compiling-without-smack.patch b/meta-agl/meta-security/recipes-security/cynara/cynara/0003-Avoid-warning-when-compiling-without-smack.patch deleted file mode 100644 index 1b105a00..00000000 --- a/meta-agl/meta-security/recipes-security/cynara/cynara/0003-Avoid-warning-when-compiling-without-smack.patch +++ /dev/null @@ -1,43 +0,0 @@ -From fdcf2a68a4bfec588b1c6c969caa0be20961b807 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh> -Date: Thu, 25 Jan 2018 11:38:16 +0100 -Subject: [PATCH] Avoid warning when compiling without smack -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When DB_FILES_SMACK_LABEL is not defined, cmake complains -with the following message: - -> -- Checking for modules '' -> Please specify at least one package name on the command line. - -Change-Id: Ie837cae81114d096f951ec0ee4ada4173fb60190 -Signed-off-by: José Bollo <jose.bollo@iot.bzh> - ---- - src/admin/CMakeLists.txt | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/admin/CMakeLists.txt b/src/admin/CMakeLists.txt -index e4f354a..38b8669 100644 ---- a/src/admin/CMakeLists.txt -+++ b/src/admin/CMakeLists.txt -@@ -23,12 +23,12 @@ IF (DB_FILES_SMACK_LABEL) - SET(SMACK "smack") - SET(LIBSMACK "libsmack") - ADD_DEFINITIONS("-DDB_FILES_SMACK_LABEL=\"${DB_FILES_SMACK_LABEL}\"") --ENDIF (DB_FILES_SMACK_LABEL) - --PKG_CHECK_MODULES(CYNARA_ADMIN_API_DEP -- REQUIRED -- ${LIBSMACK} -- ) -+ PKG_CHECK_MODULES(CYNARA_ADMIN_API_DEP -+ REQUIRED -+ ${LIBSMACK} -+ ) -+ENDIF (DB_FILES_SMACK_LABEL) - - SET(CYNARA_LIB_CYNARA_ADMIN_PATH ${CYNARA_PATH}/admin) - diff --git a/meta-agl/meta-security/recipes-security/cynara/cynara/0004-Fix-mode-of-sockets.patch b/meta-agl/meta-security/recipes-security/cynara/cynara/0004-Fix-mode-of-sockets.patch deleted file mode 100644 index f19cdfb5..00000000 --- a/meta-agl/meta-security/recipes-security/cynara/cynara/0004-Fix-mode-of-sockets.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 233fb8a93343c3c9c04914e1148ef5ab87a808a1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh> -Date: Thu, 25 Jan 2018 12:52:39 +0100 -Subject: [PATCH] Fix mode of sockets -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Setting execution bit on the socket serves nothing. - -Change-Id: I2ca1ea8e0c369ee5517878e92073ace0e50f9f10 -Signed-off-by: José Bollo <jose.bollo@iot.bzh> - ---- - systemd/cynara-admin.socket | 2 +- - systemd/cynara.socket | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/systemd/cynara-admin.socket b/systemd/cynara-admin.socket -index 2d1aea4..ed38386 100644 ---- a/systemd/cynara-admin.socket -+++ b/systemd/cynara-admin.socket -@@ -1,6 +1,6 @@ - [Socket] - ListenStream=/run/cynara/cynara-admin.socket --SocketMode=0700 -+SocketMode=0600 - SmackLabelIPIn=@ - SmackLabelIPOut=@ - -diff --git a/systemd/cynara.socket b/systemd/cynara.socket -index 9f2a870..fad2745 100644 ---- a/systemd/cynara.socket -+++ b/systemd/cynara.socket -@@ -1,6 +1,6 @@ - [Socket] - ListenStream=/run/cynara/cynara.socket --SocketMode=0777 -+SocketMode=0666 - SmackLabelIPIn=* - SmackLabelIPOut=@ - diff --git a/meta-agl/meta-security/recipes-security/cynara/cynara/0005-Allow-to-tune-sockets.patch b/meta-agl/meta-security/recipes-security/cynara/cynara/0005-Allow-to-tune-sockets.patch deleted file mode 100644 index e954c7f2..00000000 --- a/meta-agl/meta-security/recipes-security/cynara/cynara/0005-Allow-to-tune-sockets.patch +++ /dev/null @@ -1,237 +0,0 @@ -From ebde8e9fdba7bc1c8152f7e45c551030a36ece82 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh> -Date: Thu, 25 Jan 2018 13:47:37 +0100 -Subject: [PATCH] Allow to tune sockets -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Allow to change the directory of sockets -through a true integration of SOCKET_DIR - -Allow to override the socket's group of - - /run/cynara/cynara-agent.socket - - /run/cynara/cynara-monitor-get.socket - -through the newly defined variable CYNARA_ADMIN_SOCKET_GROUP - -Change-Id: I7d58854c328e948e3d6d7fa3fc00569fd08f8aef -Signed-off-by: José Bollo <jose.bollo@iot.bzh> - ---- - systemd/CMakeLists.txt | 19 +++++++++++++++---- - systemd/cynara-admin.socket | 14 -------------- - systemd/cynara-admin.socket.in | 14 ++++++++++++++ - systemd/cynara-agent.socket | 15 --------------- - systemd/cynara-agent.socket.in | 15 +++++++++++++++ - systemd/cynara-monitor-get.socket | 15 --------------- - systemd/cynara-monitor-get.socket.in | 15 +++++++++++++++ - systemd/cynara.socket | 14 -------------- - systemd/cynara.socket.in | 14 ++++++++++++++ - 9 files changed, 73 insertions(+), 62 deletions(-) - delete mode 100644 systemd/cynara-admin.socket - create mode 100644 systemd/cynara-admin.socket.in - delete mode 100644 systemd/cynara-agent.socket - create mode 100644 systemd/cynara-agent.socket.in - delete mode 100644 systemd/cynara-monitor-get.socket - create mode 100644 systemd/cynara-monitor-get.socket.in - delete mode 100644 systemd/cynara.socket - create mode 100644 systemd/cynara.socket.in - -diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt -index 20accf0..1b75c12 100644 ---- a/systemd/CMakeLists.txt -+++ b/systemd/CMakeLists.txt -@@ -16,13 +16,24 @@ - # @author Lukasz Wojciechowski <l.wojciechow@partner.samsung.com> - # - -+SET(CYNARA_ADMIN_SOCKET_GROUP -+ "security_fw" -+ CACHE STRING -+ "Group to apply on administrative sockets") -+ -+ -+CONFIGURE_FILE(cynara.socket.in cynara.socket @ONLY) -+CONFIGURE_FILE(cynara-admin.socket.in cynara-admin.socket @ONLY) -+CONFIGURE_FILE(cynara-agent.socket.in cynara-agent.socket @ONLY) -+CONFIGURE_FILE(cynara-monitor-get.socket.in cynara-monitor-get.socket @ONLY) -+ - INSTALL(FILES - ${CMAKE_SOURCE_DIR}/systemd/cynara.service - ${CMAKE_SOURCE_DIR}/systemd/cynara.target -- ${CMAKE_SOURCE_DIR}/systemd/cynara.socket -- ${CMAKE_SOURCE_DIR}/systemd/cynara-admin.socket -- ${CMAKE_SOURCE_DIR}/systemd/cynara-agent.socket -- ${CMAKE_SOURCE_DIR}/systemd/cynara-monitor-get.socket -+ ${CMAKE_BINARY_DIR}/systemd/cynara.socket -+ ${CMAKE_BINARY_DIR}/systemd/cynara-admin.socket -+ ${CMAKE_BINARY_DIR}/systemd/cynara-agent.socket -+ ${CMAKE_BINARY_DIR}/systemd/cynara-monitor-get.socket - DESTINATION - ${SYSTEMD_UNIT_DIR} - ) -diff --git a/systemd/cynara-admin.socket b/systemd/cynara-admin.socket -deleted file mode 100644 -index ed38386..0000000 ---- a/systemd/cynara-admin.socket -+++ /dev/null -@@ -1,14 +0,0 @@ --[Socket] --ListenStream=/run/cynara/cynara-admin.socket --SocketMode=0600 --SmackLabelIPIn=@ --SmackLabelIPOut=@ -- --Service=cynara.service -- --[Unit] --Wants=cynara.target --Before=cynara.target -- --[Install] --WantedBy=sockets.target -diff --git a/systemd/cynara-admin.socket.in b/systemd/cynara-admin.socket.in -new file mode 100644 -index 0000000..2364c3e ---- /dev/null -+++ b/systemd/cynara-admin.socket.in -@@ -0,0 +1,14 @@ -+[Socket] -+ListenStream=@SOCKET_DIR@/cynara-admin.socket -+SocketMode=0600 -+SmackLabelIPIn=@ -+SmackLabelIPOut=@ -+ -+Service=cynara.service -+ -+[Unit] -+Wants=cynara.target -+Before=cynara.target -+ -+[Install] -+WantedBy=sockets.target -diff --git a/systemd/cynara-agent.socket b/systemd/cynara-agent.socket -deleted file mode 100644 -index 5a677e0..0000000 ---- a/systemd/cynara-agent.socket -+++ /dev/null -@@ -1,15 +0,0 @@ --[Socket] --ListenStream=/run/cynara/cynara-agent.socket --SocketGroup=security_fw --SocketMode=0060 --SmackLabelIPIn=* --SmackLabelIPOut=@ -- --Service=cynara.service -- --[Unit] --Wants=cynara.target --Before=cynara.target -- --[Install] --WantedBy=sockets.target -diff --git a/systemd/cynara-agent.socket.in b/systemd/cynara-agent.socket.in -new file mode 100644 -index 0000000..4f86c9d ---- /dev/null -+++ b/systemd/cynara-agent.socket.in -@@ -0,0 +1,15 @@ -+[Socket] -+ListenStream=@SOCKET_DIR@/cynara-agent.socket -+SocketGroup=@CYNARA_ADMIN_SOCKET_GROUP@ -+SocketMode=0060 -+SmackLabelIPIn=* -+SmackLabelIPOut=@ -+ -+Service=cynara.service -+ -+[Unit] -+Wants=cynara.target -+Before=cynara.target -+ -+[Install] -+WantedBy=sockets.target -diff --git a/systemd/cynara-monitor-get.socket b/systemd/cynara-monitor-get.socket -deleted file mode 100644 -index a50feeb..0000000 ---- a/systemd/cynara-monitor-get.socket -+++ /dev/null -@@ -1,15 +0,0 @@ --[Socket] --ListenStream=/run/cynara/cynara-monitor-get.socket --SocketGroup=security_fw --SocketMode=0060 --SmackLabelIPIn=@ --SmackLabelIPOut=@ -- --Service=cynara.service -- --[Unit] --Wants=cynara.target --Before=cynara.target -- --[Install] --WantedBy=sockets.target -diff --git a/systemd/cynara-monitor-get.socket.in b/systemd/cynara-monitor-get.socket.in -new file mode 100644 -index 0000000..b88dbf7 ---- /dev/null -+++ b/systemd/cynara-monitor-get.socket.in -@@ -0,0 +1,15 @@ -+[Socket] -+ListenStream=@SOCKET_DIR@/cynara-monitor-get.socket -+SocketGroup=@CYNARA_ADMIN_SOCKET_GROUP@ -+SocketMode=0060 -+SmackLabelIPIn=@ -+SmackLabelIPOut=@ -+ -+Service=cynara.service -+ -+[Unit] -+Wants=cynara.target -+Before=cynara.target -+ -+[Install] -+WantedBy=sockets.target -diff --git a/systemd/cynara.socket b/systemd/cynara.socket -deleted file mode 100644 -index fad2745..0000000 ---- a/systemd/cynara.socket -+++ /dev/null -@@ -1,14 +0,0 @@ --[Socket] --ListenStream=/run/cynara/cynara.socket --SocketMode=0666 --SmackLabelIPIn=* --SmackLabelIPOut=@ -- --Service=cynara.service -- --[Unit] --Wants=cynara.target --Before=cynara.target -- --[Install] --WantedBy=sockets.target -diff --git a/systemd/cynara.socket.in b/systemd/cynara.socket.in -new file mode 100644 -index 0000000..ba76549 ---- /dev/null -+++ b/systemd/cynara.socket.in -@@ -0,0 +1,14 @@ -+[Socket] -+ListenStream=@SOCKET_DIR@/cynara.socket -+SocketMode=0666 -+SmackLabelIPIn=* -+SmackLabelIPOut=@ -+ -+Service=cynara.service -+ -+[Unit] -+Wants=cynara.target -+Before=cynara.target -+ -+[Install] -+WantedBy=sockets.target diff --git a/meta-agl/meta-security/recipes-security/cynara/cynara/0006-Install-socket-activation-by-default.patch b/meta-agl/meta-security/recipes-security/cynara/cynara/0006-Install-socket-activation-by-default.patch deleted file mode 100644 index 68864f1e..00000000 --- a/meta-agl/meta-security/recipes-security/cynara/cynara/0006-Install-socket-activation-by-default.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 23f1a7cb34dd4ef88bac5a43057feaf7f50559aa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh> -Date: Thu, 25 Jan 2018 14:09:23 +0100 -Subject: [PATCH] Install socket activation by default -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Change-Id: Ifd10c3800486689ed0ed6271df59760ccfbf6caf -Signed-off-by: José Bollo <jose.bollo@iot.bzh> - ---- - packaging/cynara.spec | 5 ----- - systemd/CMakeLists.txt | 7 +++++++ - systemd/sockets.target.wants/cynara-admin.socket | 1 + - systemd/sockets.target.wants/cynara-agent.socket | 1 + - systemd/sockets.target.wants/cynara.socket | 1 + - 5 files changed, 10 insertions(+), 5 deletions(-) - create mode 120000 systemd/sockets.target.wants/cynara-admin.socket - create mode 120000 systemd/sockets.target.wants/cynara-agent.socket - create mode 120000 systemd/sockets.target.wants/cynara.socket - -diff --git a/packaging/cynara.spec b/packaging/cynara.spec -index d2e0b80..2c5b326 100644 ---- a/packaging/cynara.spec -+++ b/packaging/cynara.spec -@@ -72,12 +72,7 @@ make %{?jobs:-j%jobs} - rm -rf %{buildroot} - %make_install - --mkdir -p %{buildroot}%{_unitdir}/sockets.target.wants - mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants --ln -s ../cynara.socket %{buildroot}%{_unitdir}/sockets.target.wants/cynara.socket --ln -s ../cynara-admin.socket %{buildroot}%{_unitdir}/sockets.target.wants/cynara-admin.socket --ln -s ../cynara-agent.socket %{buildroot}%{_unitdir}/sockets.target.wants/cynara-agent.socket --ln -s ../cynara-monitor-get.socket %{buildroot}%{_unitdir}/sockets.target.wants/cynara-monitor-get.socket - ln -s ../cynara.service %{buildroot}%{_unitdir}/multi-user.target.wants/cynara.service - - %post -diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt -index 1b75c12..9a2d70d 100644 ---- a/systemd/CMakeLists.txt -+++ b/systemd/CMakeLists.txt -@@ -38,3 +38,10 @@ INSTALL(FILES - ${SYSTEMD_UNIT_DIR} - ) - -+INSTALL(DIRECTORY -+ ${CMAKE_SOURCE_DIR}/systemd/sockets.target.wants -+ DESTINATION -+ ${SYSTEMD_UNIT_DIR} -+) -+ -+ -diff --git a/systemd/sockets.target.wants/cynara-admin.socket b/systemd/sockets.target.wants/cynara-admin.socket -new file mode 120000 -index 0000000..3d0b1ce ---- /dev/null -+++ b/systemd/sockets.target.wants/cynara-admin.socket -@@ -0,0 +1 @@ -+../cynara-admin.socket -\ No newline at end of file -diff --git a/systemd/sockets.target.wants/cynara-agent.socket b/systemd/sockets.target.wants/cynara-agent.socket -new file mode 120000 -index 0000000..22b37dd ---- /dev/null -+++ b/systemd/sockets.target.wants/cynara-agent.socket -@@ -0,0 +1 @@ -+../cynara-agent.socket -\ No newline at end of file -diff --git a/systemd/sockets.target.wants/cynara.socket b/systemd/sockets.target.wants/cynara.socket -new file mode 120000 -index 0000000..c0e5a5b ---- /dev/null -+++ b/systemd/sockets.target.wants/cynara.socket -@@ -0,0 +1 @@ -+../cynara.socket -\ No newline at end of file diff --git a/meta-agl/meta-security/recipes-security/cynara/cynara/cynara-db-migration-abort-on-errors.patch b/meta-agl/meta-security/recipes-security/cynara/cynara/cynara-db-migration-abort-on-errors.patch deleted file mode 100644 index c1441892..00000000 --- a/meta-agl/meta-security/recipes-security/cynara/cynara/cynara-db-migration-abort-on-errors.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3605e9f8a3ea1252d1cf221398431e0d7a3ea34d Mon Sep 17 00:00:00 2001 -From: Patrick Ohly <patrick.ohly@intel.com> -Date: Mon, 23 Mar 2015 15:01:39 -0700 -Subject: [PATCH] cynara-db-migration.in: abort on errors - -"set -e" enables error checking for all commands invoked by the script. -Previously, errors were silently ignored. - -Upstream-status: Submitted [https://github.com/Samsung/cynara/pull/8] - -Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> - ---- - migration/cynara-db-migration.in | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/migration/cynara-db-migration.in b/migration/cynara-db-migration.in -index 7b666d4..0682df6 100644 ---- a/migration/cynara-db-migration.in -+++ b/migration/cynara-db-migration.in -@@ -19,6 +19,8 @@ - # @brief Migration tool for Cynara's database - # - -+set -e -+ - ##### Constants (these must not be modified by shell) - - PATH=/bin:/usr/bin:/sbin:/usr/sbin diff --git a/meta-agl/meta-security/recipes-security/cynara/cynara/run-ptest b/meta-agl/meta-security/recipes-security/cynara/cynara/run-ptest deleted file mode 100755 index f8dd5d8b..00000000 --- a/meta-agl/meta-security/recipes-security/cynara/cynara/run-ptest +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cynara-tests | sed -e 's/^\[ *OK *\] \(\S*\)$/PASS: \1/' -e 's/^\[ *FAILED *\] \(\S*\)$/FAIL: \1/' -sh /usr/bin/cynara-db-migration-tests | sed -e 's/^Test .*(\([^)]*\)).*passed.*/PASS: \1/' -e 's/^Test .*(\([^)]*\)).*failed.*/FAIL: \1/' diff --git a/meta-agl/meta-security/recipes-security/cynara/cynara_0.14.10.bb b/meta-agl/meta-security/recipes-security/cynara/cynara_0.14.10.bb deleted file mode 100644 index 765c17bc..00000000 --- a/meta-agl/meta-security/recipes-security/cynara/cynara_0.14.10.bb +++ /dev/null @@ -1,157 +0,0 @@ -DESCRIPTION = "Cynara service with client libraries" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327;beginline=3" - -PV = "0.14.10+git${SRCPV}" -SRCREV = "be455dcaf1400bec0272a6ce90852b9147393a60" -SRC_URI = "git://github.com/Samsung/cynara.git" -S = "${WORKDIR}/git" - -SRC_URI += " \ - file://cynara-db-migration-abort-on-errors.patch \ - file://0001-Add-fallthrough-tags.patch \ - file://0002-gcc-7-requires-include-functional-for-std-function.patch \ - file://0003-Avoid-warning-when-compiling-without-smack.patch \ - file://0004-Fix-mode-of-sockets.patch \ - file://0005-Allow-to-tune-sockets.patch \ - file://0006-Install-socket-activation-by-default.patch \ - file://0001-fix-fallthrough-in-cmdlineparser.patch \ -" - -DEPENDS = " \ -systemd \ -" - -PACKAGECONFIG ??= "" -# Use debug mode to increase logging. Beware, also compiles with less optimization -# and thus has to disable FORTIFY_SOURCE below. -PACKAGECONFIG[debug] = "-DCMAKE_BUILD_TYPE=DEBUG,-DCMAKE_BUILD_TYPE=RELEASE,libunwind elfutils" - -inherit cmake - -EXTRA_OECMAKE += " \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DBUILD_WITH_SYSTEMD_DAEMON=ON \ - -DBUILD_WITH_SYSTEMD_JOURNAL=ON \ - -DSYSTEMD_UNIT_DIR=${systemd_system_unitdir} \ - -DSOCKET_DIR=/run/cynara \ - -DBUILD_COMMONS=ON \ - -DBUILD_SERVICE=ON \ - -DBUILD_DBUS=OFF \ - -DCYNARA_ADMIN_SOCKET_GROUP=cynara \ -" - -# Explicitly package empty directory. Otherwise Cynara prints warnings -# at runtime: -# cyad[198]: Couldn't scan for plugins in </usr/lib/cynara/plugin/service/> : <No such file or directory> -FILES_${PN}_append = " \ -${libdir}/cynara/plugin/service \ -${libdir}/cynara/plugin/client \ -" - -inherit useradd -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "-r cynara" -USERADD_PARAM_${PN} = "\ ---system --home ${localstatedir}/lib/empty \ ---no-create-home --shell /bin/false \ ---gid cynara cynara \ -" - -# Causes deadlock during booting, see workaround in postinst below. -#inherit systemd -#SYSTEMD_SERVICE_${PN} = "cynara.service" - -#do_install_append () { -# chmod a+rx ${D}/${sbindir}/cynara-db-migration -# -# install -d ${D}${sysconfdir}/cynara/ -# install -m 644 ${S}/conf/creds.conf ${D}/${sysconfdir}/cynara/creds.conf -# -# # No need to create empty directories except for those which -# # Cynara expects to find. -# # install -d ${D}${localstatedir}/cynara/ -# # install -d ${D}${prefix}/share/cynara/tests/empty_db -# install -d ${D}${libdir}/cynara/plugin/client -# install -d ${D}${libdir}/cynara/plugin/service -# -# # install db* ${D}${prefix}/share/cynara/tests/ -# -# install -d ${D}${systemd_system_unitdir}/sockets.target.wants -# ln -s ../cynara.socket ${D}${systemd_system_unitdir}/sockets.target.wants/cynara.socket -# ln -s ../cynara-admin.socket ${D}${systemd_system_unitdir}/sockets.target.wants/cynara-admin.socket -# ln -s ../cynara-agent.socket ${D}${systemd_system_unitdir}/sockets.target.wants/cynara-agent.socket -#} - -# We want the post-install logic to create and label /var/cynara, so -# it should not be in the package. -do_install_append () { - rmdir ${D}${localstatedir}/cynara -} - -FILES_${PN} += "${systemd_system_unitdir}" - -# Cynara itself has no dependency on Smack. Only its installation -# is Smack-aware in the sense that it sets Smack labels. Do not -# depend on smack userspace unless we really need Smack labels. -# -# The Tizen .spec file calls cynara-db-migration in a %pre section. -# That only works when cynara-db-migration is packaged separately -# (overly complex) and does not seem necessary: perhaps there is a -# time window where cynara might already get activated before -# the postinst completes, but that is a general problem. It gets -# avoided entirely when calling this script while building the -# rootfs. -DEPENDS_append_with-lsm-smack = " smack smack-native" -EXTRA_OECMAKE_append_with-lsm-smack = " -DDB_FILES_SMACK_LABEL=System" -CHSMACK_with-lsm-smack = "chsmack" -CHSMACK = "true" -pkg_postinst_ontarget_${PN} () { - mkdir -p $D${sysconfdir}/cynara - ${CHSMACK} -a System $D${sysconfdir}/cynara - - # Strip git patch level information, the version comparison code - # in cynara-db-migration only expect major.minor.patch version numbers. - VERSION=${@d.getVar('PV',d,1).split('+git')[0]} - if [ -d $D${localstatedir}/cynara ] ; then - # upgrade - echo "NOTE: updating cynara DB to version $VERSION" - $D${sbindir}/cynara-db-migration upgrade -f 0.0.0 -t $VERSION - else - # install - echo "NOTE: creating cynara DB for version $VERSION" - mkdir -p $D${localstatedir}/cynara - ${CHSMACK} -a System $D${localstatedir}/cynara - $D${sbindir}/cynara-db-migration install -t $VERSION - fi - - # Workaround for systemd.bbclass issue: it would call - # "systemctl start" without "--no-block", but because - # the service is not ready to run at the time when - # this scripts gets executed by run-postinsts.service, - # booting deadlocks. - echo "NOTE: enabling and starting cynara service" - systemctl enable cynara - systemctl start --no-block cynara -} - -# Testing depends on gmock and gtest. They can be found in meta-oe -# and are not necessarily available, so this feature is off by default. -# If gmock from meta-oe is used, then a workaround is needed to avoid -# a link error (libgmock.a calls pthread functions without libpthread -# being listed in the .pc file). -DEPENDS_append = "${@bb.utils.contains('PACKAGECONFIG', 'tests', ' gmock', '', d)}" -LDFLAGS_append = "${@bb.utils.contains('PACKAGECONFIG', 'tests', ' -lpthread', '', d)}" -SRC_URI_append = "${@bb.utils.contains('PACKAGECONFIG', 'tests', ' file://run-ptest', '', d)}" -PACKAGECONFIG[tests] = "-DBUILD_TESTS:BOOL=ON,-DBUILD_TESTS:BOOL=OFF,gmock gtest," - -# Will be empty if no tests were built. -inherit ptest -FILES_${PN}-ptest += "${bindir}/cynara-tests ${bindir}/cynara-db-migration-tests ${datadir}/cynara/tests" -do_install_ptest () { - if ${@bb.utils.contains('PACKAGECONFIG', 'tests', 'true', 'false', d)}; then - mkdir -p ${D}/${datadir}/cynara/tests - cp -r ${S}/test/db/* ${D}/${datadir}/cynara/tests - fi -} - diff --git a/meta-agl/meta-security/recipes-security/security-manager/security-manager.inc b/meta-agl/meta-security/recipes-security/security-manager/security-manager.inc index ddd87a93..fdc5083e 100644 --- a/meta-agl/meta-security/recipes-security/security-manager/security-manager.inc +++ b/meta-agl/meta-security/recipes-security/security-manager/security-manager.inc @@ -4,35 +4,33 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327;beginlin inherit cmake -# Out-of-tree build is broken ("sqlite3 .security-manager.db <db.sql" where db.sql is in $S/db). B = "${S}" DEPENDS = " \ -attr \ -boost \ -cynara \ -icu \ -libcap \ -smack \ -sqlite3 \ -sqlite3-native \ -systemd \ + attr \ + boost \ + cynara \ + icu \ + libcap \ + smack \ + sqlite3 \ + systemd \ " PACKAGECONFIG ??= "" PACKAGECONFIG[debug] = "-DCMAKE_BUILD_TYPE=DEBUG,-DCMAKE_BUILD_TYPE=RELEASE" -TZ_SYS_DB = "/var/local/db/security-manager" +TZ_SYS_DB ?= "/var/db/security-manager" EXTRA_OECMAKE = " \ --DCMAKE_VERBOSE_MAKEFILE=ON \ --DVERSION=${PV} \ --DSYSTEMD_INSTALL_DIR=${systemd_unitdir}/system \ --DBIN_INSTALL_DIR=${bindir} \ --DDB_INSTALL_DIR=${TZ_SYS_DB} \ --DLIB_INSTALL_DIR=${libdir} \ --DSHARE_INSTALL_PREFIX=${datadir} \ --DINCLUDE_INSTALL_DIR=${includedir} \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DVERSION=${PV} \ + -DSYSTEMD_INSTALL_DIR=${systemd_unitdir}/system \ + -DBIN_INSTALL_DIR=${bindir} \ + -DDB_INSTALL_DIR=${TZ_SYS_DB} \ + -DLIB_INSTALL_DIR=${libdir} \ + -DSHARE_INSTALL_PREFIX=${datadir} \ + -DINCLUDE_INSTALL_DIR=${includedir} \ " inherit systemd @@ -71,16 +69,11 @@ do_install_append () { ln -s ../security-manager.socket ${D}/${systemd_unitdir}/system/sockets.target.wants/security-manager.socket } -RDEPENDS_${PN} += "smack" -pkg_postinst_${PN} () { - set -e - chsmack -a System $D${TZ_SYS_DB}/.security-manager.db - chsmack -a System $D${TZ_SYS_DB}/.security-manager.db-journal -} - +RDEPENDS_${PN} += "sqlite3 cynara" FILES_${PN} += " \ -${systemd_unitdir} \ -${TZ_SYS_DB} \ + ${systemd_unitdir} \ + ${TZ_SYS_DB} \ + ${bindir}/.security-manager-setup \ " PACKAGES =+ "${PN}-policy" @@ -88,7 +81,3 @@ FILES_${PN}-policy = " \ ${datadir}/${PN} \ ${bindir}/security-manager-policy-reload \ " -RDEPENDS_${PN}-policy += "sqlite3 cynara" -pkg_postinst_ontarget_${PN}-policy () { - ${bindir}/security-manager-policy-reload -} diff --git a/meta-agl/meta-security/recipes-security/security-manager/security-manager/systemd-stop-using-compat-libs.patch b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0001-systemd-stop-using-compat-libs.patch index cd5c36a6..91ce8196 100644 --- a/meta-agl/meta-security/recipes-security/security-manager/security-manager/systemd-stop-using-compat-libs.patch +++ b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0001-systemd-stop-using-compat-libs.patch @@ -1,7 +1,7 @@ -From 8ec024d2adecb53029c6f1af2b95c93dfd43a7cb Mon Sep 17 00:00:00 2001 +From 3d9d1d83fe298a364f51ad752c17aad461beded3 Mon Sep 17 00:00:00 2001 From: Patrick Ohly <patrick.ohly@intel.com> Date: Tue, 24 Mar 2015 04:54:03 -0700 -Subject: [PATCH] systemd: stop using compat libs +Subject: [PATCH 01/14] systemd: stop using compat libs libsystemd-journal and libsystemd-daemon are considered obsolete in systemd since 2.09 and may not be available (not compiled @@ -12,7 +12,6 @@ use that. Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Upstream-Status: Submitted (https://github.com/Samsung/security-manager/pull/1 - --- src/common/CMakeLists.txt | 2 +- src/server/CMakeLists.txt | 2 +- @@ -44,4 +43,5 @@ index 753eb96..6849d76 100644 FIND_PACKAGE(Boost REQUIRED) -- -2.1.4 +2.21.0 + diff --git a/meta-agl/meta-security/recipes-security/security-manager/security-manager/security-manager-policy-reload-do-not-depend-on-GNU-.patch b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0002-security-manager-policy-reload-do-not-depend-on-GNU-.patch index ac57964c..b6346480 100644 --- a/meta-agl/meta-security/recipes-security/security-manager/security-manager/security-manager-policy-reload-do-not-depend-on-GNU-.patch +++ b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0002-security-manager-policy-reload-do-not-depend-on-GNU-.patch @@ -1,7 +1,8 @@ -From d2995014142306987bf86b4d508a84b9b4683c5c Mon Sep 17 00:00:00 2001 +From a90515613f09140049b2bdf471fa83d5dd7bad1c Mon Sep 17 00:00:00 2001 From: Patrick Ohly <patrick.ohly@intel.com> Date: Wed, 19 Aug 2015 15:02:32 +0200 -Subject: [PATCH 2/2] security-manager-policy-reload: do not depend on GNU sed +Subject: [PATCH 02/14] security-manager-policy-reload: do not depend on GNU + sed \U (= make replacement uppercase) is a GNU sed extension which is not supported by other sed implementation's (like the one from @@ -13,7 +14,6 @@ bucket name into uppercase. Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Upstream-Status: Submitted (https://github.com/Samsung/security-manager/pull/1 - --- policy/security-manager-policy-reload | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -32,4 +32,5 @@ index 274c49c..6f211c6 100755 # Re-create the bucket with empty contents cyad --delete-bucket=$bucket || true -- -2.1.4 +2.21.0 + diff --git a/meta-agl/meta-security/recipes-security/security-manager/security-manager/0001-Smack-rules-create-two-new-functions.patch b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0003-Smack-rules-create-two-new-functions.patch index b0e11afe..d79345e0 100644 --- a/meta-agl/meta-security/recipes-security/security-manager/security-manager/0001-Smack-rules-create-two-new-functions.patch +++ b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0003-Smack-rules-create-two-new-functions.patch @@ -1,7 +1,7 @@ -From d130a7384428a96f31ad5950ffbffadc0aa29a15 Mon Sep 17 00:00:00 2001 +From a80e33bc0a10fa4bed5d0b7bf29f45dd2565d309 Mon Sep 17 00:00:00 2001 From: Alejandro Joya <alejandro.joya.cruz@intel.com> Date: Wed, 4 Nov 2015 19:01:35 -0600 -Subject: [PATCH 1/2] Smack-rules: create two new functions +Subject: [PATCH 03/14] Smack-rules: create two new functions It let to smack-rules to create multiple set of rules related with the privileges. @@ -9,14 +9,15 @@ related with the privileges. It runs from the same bases than for a static set of rules on the template, but let you add 1 or many templates for different cases. +Change-Id: I14f8d4e914ad5a7ba34c96f3cb5589f0b15292de Signed-off-by: Alejandro Joya <alejandro.joya.cruz@intel.com> --- - src/common/include/smack-rules.h | 15 ++++++++++++++ - src/common/smack-rules.cpp | 44 ++++++++++++++++++++++++++++++++++++++++ + src/common/include/smack-rules.h | 15 +++++++++++ + src/common/smack-rules.cpp | 44 ++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/src/common/include/smack-rules.h b/src/common/include/smack-rules.h -index 91446a7..f9fa438 100644 +index 91446a7..3ad9dd4 100644 --- a/src/common/include/smack-rules.h +++ b/src/common/include/smack-rules.h @@ -47,6 +47,8 @@ public: @@ -28,10 +29,11 @@ index 91446a7..f9fa438 100644 void apply() const; void clear() const; -@@ -75,6 +77,19 @@ public: +@@ -74,6 +76,19 @@ public: + */ static void installApplicationRules(const std::string &appId, const std::string &pkgId, const std::vector<std::string> &pkgContents); - /** ++ /** + * Install privileges-specific smack rules. + * + * Function creates smack rules using predefined template. Rules are applied @@ -40,16 +42,15 @@ index 91446a7..f9fa438 100644 + * @param[in] appId - application id that is beeing installed + * @param[in] pkgId - package id that the application is in + * @param[in] pkgContents - a list of all applications in the package -+ * @param[in] privileges - a list of all prvileges ++ * @param[in] privileges - a list of all prvileges + */ + static void installApplicationPrivilegesRules(const std::string &appId, const std::string &pkgId, + const std::vector<std::string> &pkgContents, const std::vector<std::string> &privileges); -+ /** + /** * Uninstall package-specific smack rules. * - * Function loads package-specific smack rules, revokes them from the kernel diff --git a/src/common/smack-rules.cpp b/src/common/smack-rules.cpp -index 3629e0f..d834e42 100644 +index 3629e0f..922a56f 100644 --- a/src/common/smack-rules.cpp +++ b/src/common/smack-rules.cpp @@ -135,6 +135,29 @@ void SmackRules::saveToFile(const std::string &path) const @@ -98,7 +99,7 @@ index 3629e0f..d834e42 100644 + continue; + std::string fprivilege ( privilege + "-template.smack"); + std::string path(tzplatform_mkpath4(TZ_SYS_SHARE, "security-manager", "policy", fprivilege.c_str())); -+ if( stat(path.c_str(), &buffer) == 0) ++ if( stat(path.c_str(), &buffer) == 0) + smackRules.addFromTemplateFile(appId, pkgId, path); + } + @@ -112,5 +113,5 @@ index 3629e0f..d834e42 100644 const std::vector<std::string> &pkgContents) { -- -2.1.0 +2.21.0 diff --git a/meta-agl/meta-security/recipes-security/security-manager/security-manager/0002-app-install-implement-multiple-set-of-smack-rules.patch b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0004-app-install-implement-multiple-set-of-smack-rules.patch index d60096a1..59d4971f 100644 --- a/meta-agl/meta-security/recipes-security/security-manager/security-manager/0002-app-install-implement-multiple-set-of-smack-rules.patch +++ b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0004-app-install-implement-multiple-set-of-smack-rules.patch @@ -1,7 +1,7 @@ -From 19688cbe2ca10921a499f3fa265928dca54cf98d Mon Sep 17 00:00:00 2001 +From a5979d9d674e400ecd7fcdf5d7589cfa0cfeb492 Mon Sep 17 00:00:00 2001 From: Alejandro Joya <alejandro.joya.cruz@intel.com> Date: Wed, 4 Nov 2015 19:06:23 -0600 -Subject: [PATCH 2/2] app-install: implement multiple set of smack-rules +Subject: [PATCH 04/14] app-install: implement multiple set of smack-rules If it's need it could create load multiple set of smack rules related with the privileges. @@ -30,5 +30,5 @@ index 7fd621c..ae305d3 100644 LogError("Error while applying Smack policy for application: " << e.DumpToString()); return SECURITY_MANAGER_API_ERROR_SETTING_FILE_LABEL_FAILED; -- -2.1.0 +2.21.0 diff --git a/meta-agl/meta-security/recipes-security/security-manager/security-manager/c-11-replace-depracated-auto_ptr.patch b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0005-c-11-replace-deprecated-auto_ptr.patch index c312a9e7..0739f28c 100644 --- a/meta-agl/meta-security/recipes-security/security-manager/security-manager/c-11-replace-depracated-auto_ptr.patch +++ b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0005-c-11-replace-deprecated-auto_ptr.patch @@ -1,7 +1,7 @@ -From 6abeec29a0e704f4bf7084b29275b99fea0a78de Mon Sep 17 00:00:00 2001 +From 198ba9b9782fda19803e94d2afeff91189ac27af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Bollo?= <jobol@nonadev.net> Date: Wed, 13 Jan 2016 17:30:06 +0100 -Subject: [PATCH 2/2] c++11: replace depracated auto_ptr +Subject: [PATCH 05/14] c++11: replace deprecated auto_ptr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -28,5 +28,5 @@ index dd03f5e..185b6c7 100644 /** * Binary stream implemented as constant size bucket list -- -2.1.4 +2.21.0 diff --git a/meta-agl/meta-security/recipes-security/security-manager/security-manager/socket-manager-removes-tizen-specific-call.patch b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0006-socket-manager-removes-tizen-specific-call.patch index fa4c21c7..3b8aad98 100644 --- a/meta-agl/meta-security/recipes-security/security-manager/security-manager/socket-manager-removes-tizen-specific-call.patch +++ b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0006-socket-manager-removes-tizen-specific-call.patch @@ -1,7 +1,7 @@ -From 75c4852e47217ab85d6840b488ab4b3688091856 Mon Sep 17 00:00:00 2001 +From ec098bf03cea23350ca7d1ea2ad88b9c88228943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh> Date: Fri, 8 Jan 2016 16:53:46 +0100 -Subject: [PATCH 1/2] socket-manager: removes tizen specific call +Subject: [PATCH 06/14] socket-manager: removes tizen specific call MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -18,7 +18,7 @@ Signed-off-by: José Bollo <jobol@nonadev.net> 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/server/main/socket-manager.cpp b/src/server/main/socket-manager.cpp -index 0366186..c5cec18 100644 +index 94c54c6..5e1a79b 100644 --- a/src/server/main/socket-manager.cpp +++ b/src/server/main/socket-manager.cpp @@ -30,6 +30,7 @@ @@ -29,7 +29,7 @@ index 0366186..c5cec18 100644 #include <sys/un.h> #include <sys/stat.h> #include <unistd.h> -@@ -500,9 +501,9 @@ int SocketManager::CreateDomainSocketHelp( +@@ -493,9 +494,9 @@ int SocketManager::CreateDomainSocketHelp( if (smack_check()) { LogInfo("Set up smack label: " << desc.smackLabel); @@ -43,5 +43,5 @@ index 0366186..c5cec18 100644 } else { LogInfo("No smack on platform. Socket won't be securied with smack label!"); -- -2.1.4 +2.21.0 diff --git a/meta-agl/meta-security/recipes-security/security-manager/security-manager/removes-dependency-to-libslp-db-utils.patch b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0007-removes-dependency-to-libslp-db-utils.patch index f9497307..bad99d25 100644 --- a/meta-agl/meta-security/recipes-security/security-manager/security-manager/removes-dependency-to-libslp-db-utils.patch +++ b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0007-removes-dependency-to-libslp-db-utils.patch @@ -1,16 +1,16 @@ -From 1e2f8f58d4320afa1d83a6f94822e53346108ee8 Mon Sep 17 00:00:00 2001 +From 9d0791dab4b4df086374c5c0ba2a6558e10e81c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh> Date: Mon, 16 Nov 2015 15:56:27 +0100 -Subject: [PATCH] removes dependency to libslp-db-utils +Subject: [PATCH 07/14] removes dependency to libslp-db-utils Change-Id: I90471e77d20e04bae58cc42eb2639e4aef97fdec --- - src/common/CMakeLists.txt | 1 ++- + src/common/CMakeLists.txt | 3 ++- src/dpl/db/src/sql_connection.cpp | 17 +---------------- - 2 files changed, 3 additions(+), 17 deletions(-) + 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt -index 968c7c1..d1fe644 100644 +index 968c7c1..9ae376f 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -5,7 +5,8 @@ PKG_CHECK_MODULES(COMMON_DEP @@ -18,13 +18,13 @@ index 968c7c1..d1fe644 100644 libsystemd libsmack - db-util -+ sqlite3 ++ sqlite3 + icu-i18n cynara-admin cynara-client ) diff --git a/src/dpl/db/src/sql_connection.cpp b/src/dpl/db/src/sql_connection.cpp -index fdb4fe4..1fb97be 100644 +index fdb4fe4..f49a6dc 100644 --- a/src/dpl/db/src/sql_connection.cpp +++ b/src/dpl/db/src/sql_connection.cpp @@ -26,7 +26,6 @@ @@ -74,5 +74,5 @@ index fdb4fe4..1fb97be 100644 if (result != SQLITE_OK) { const char *error = sqlite3_errmsg(m_connection); -- -2.1.4 +2.21.0 diff --git a/meta-agl/meta-app-framework/recipes-core/security-manager/security-manager/0001-Fix-gcc6-build.patch b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0008-Fix-gcc6-build.patch index 1b3c8c42..5ece7ef4 100644 --- a/meta-agl/meta-app-framework/recipes-core/security-manager/security-manager/0001-Fix-gcc6-build.patch +++ b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0008-Fix-gcc6-build.patch @@ -1,7 +1,7 @@ -From cb9acc2b723b297ee373bf814282711f02657aa5 Mon Sep 17 00:00:00 2001 +From a1d9b40b4fa2e73d31a53e398c286bffeaae1732 Mon Sep 17 00:00:00 2001 From: Ronan <ronan.lemartret@iot.bzh> Date: Wed, 12 Oct 2016 17:48:55 +0200 -Subject: [PATCH] Fix gcc6 build +Subject: [PATCH 08/14] Fix gcc6 build Signed-off-by: ronan <ronan@ot.bzh> --- @@ -18,11 +18,11 @@ index 74a6b30..347cddd 100644 #include <security-manager.h> #include <client-offline.h> +#include <linux/xattr.h> - + static const char *EMPTY = ""; - + diff --git a/src/common/include/privilege_db.h b/src/common/include/privilege_db.h -index 03c6680..8dd39a1 100644 +index 4d73d90..08fb9d6 100644 --- a/src/common/include/privilege_db.h +++ b/src/common/include/privilege_db.h @@ -32,6 +32,7 @@ @@ -30,9 +30,9 @@ index 03c6680..8dd39a1 100644 #include <stdbool.h> #include <string> +#include <vector> - + #include <dpl/db/sql_connection.h> - + #include <tzplatform_config.h> -- -2.6.6 +2.21.0 diff --git a/meta-agl/meta-app-framework/recipes-core/security-manager/security-manager/0001-Fix-Cmake-conf-for-gcc6-build.patch b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0009-Fix-Cmake-conf-for-gcc6-build.patch index 43a3ee10..706eb1a9 100644 --- a/meta-agl/meta-app-framework/recipes-core/security-manager/security-manager/0001-Fix-Cmake-conf-for-gcc6-build.patch +++ b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0009-Fix-Cmake-conf-for-gcc6-build.patch @@ -1,7 +1,7 @@ -From 19c99315a5dcba3b696c30d1fdd42a1dcd574a80 Mon Sep 17 00:00:00 2001 +From 382379d74221bcc60a0ab70d63430a1c0587b2ec Mon Sep 17 00:00:00 2001 From: Ronan <ronan.lemartret@iot.bzh> Date: Thu, 13 Oct 2016 11:37:47 +0200 -Subject: [PATCH] Fix Cmake conf for gcc6 build +Subject: [PATCH 09/14] Fix Cmake conf for gcc6 build Signed-off-by: Ronan <ronan.lemartret@iot.bzh> --- @@ -24,7 +24,7 @@ index ee9a160..aa7a12c 100644 INCLUDE_DIRECTORIES( ${INCLUDE_PATH} diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt -index 753eb96..8eef25d 100644 +index 6849d76..9598037 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -8,7 +8,6 @@ FIND_PACKAGE(Threads REQUIRED) @@ -36,5 +36,5 @@ index 753eb96..8eef25d 100644 ) -- -2.6.6 +2.21.0 diff --git a/meta-agl/meta-app-framework/recipes-core/security-manager/security-manager/0001-gcc-7-requires-include-functional-for-std-function.patch b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0010-gcc-7-requires-include-functional-for-std-function.patch index 7b6845ab..0f48c5f6 100644 --- a/meta-agl/meta-app-framework/recipes-core/security-manager/security-manager/0001-gcc-7-requires-include-functional-for-std-function.patch +++ b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0010-gcc-7-requires-include-functional-for-std-function.patch @@ -1,7 +1,7 @@ -From ed1c105db9d7b1ceb52ec16f35b0a2c959c19c6d Mon Sep 17 00:00:00 2001 +From 8e93699c0f225716f3cd5eff790270ae9e3880f9 Mon Sep 17 00:00:00 2001 From: Changhyeok Bae <changhyeok.bae@gmail.com> Date: Sun, 17 Dec 2017 15:40:58 +0000 -Subject: [PATCH] gcc-7 requires include <functional> for std::function +Subject: [PATCH 10/14] gcc-7 requires include <functional> for std::function Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com> --- @@ -47,5 +47,5 @@ index 72817a6..838409f 100644 namespace SecurityManager { BinaryQueue::BinaryQueue() : -- -2.7.4 +2.21.0 diff --git a/meta-agl/meta-security/recipes-security/security-manager/security-manager/0001-Fix-gcc8-warning-error-Werror-catch-value.patch b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0011-Fix-gcc8-warning-error-Werror-catch-value.patch index 5a55a312..5c679fc2 100644 --- a/meta-agl/meta-security/recipes-security/security-manager/security-manager/0001-Fix-gcc8-warning-error-Werror-catch-value.patch +++ b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0011-Fix-gcc8-warning-error-Werror-catch-value.patch @@ -1,7 +1,7 @@ -From 37c63c280eaec8cae3a321d45404d6c03a68c9d9 Mon Sep 17 00:00:00 2001 +From 243b7ffee16558d7cb9b411f49380138efeffca9 Mon Sep 17 00:00:00 2001 From: Stephane Desneux <stephane.desneux@iot.bzh> Date: Fri, 1 Feb 2019 12:26:17 +0000 -Subject: [PATCH] Fix gcc8 warning/error [-Werror=catch-value=] +Subject: [PATCH 11/14] Fix gcc8 warning/error [-Werror=catch-value=] Fixes the following warning/error during compile: @@ -28,5 +28,5 @@ index 63538a2..fc60ce9 100644 } -- -2.11.0 +2.21.0 diff --git a/meta-agl/meta-security/recipes-security/security-manager/security-manager/0001-Avoid-casting-from-const-T-to-void.patch b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0012-Avoid-casting-from-const-T-to-void.patch index f598fdc8..91ccf9ee 100644 --- a/meta-agl/meta-security/recipes-security/security-manager/security-manager/0001-Avoid-casting-from-const-T-to-void.patch +++ b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0012-Avoid-casting-from-const-T-to-void.patch @@ -1,7 +1,7 @@ -From 14c8842ed8a37fecbc70d46e27b49ae929b0c85f Mon Sep 17 00:00:00 2001 +From 5ee51d38575f289c2bf37ed817ef680ed47bb320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh> Date: Fri, 1 Feb 2019 15:37:44 +0100 -Subject: [PATCH] Avoid casting from "const T&" to "void*" +Subject: [PATCH 12/14] Avoid casting from "const T&" to "void*" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -15,14 +15,14 @@ is coming from the const or not. Signed-off-by: José Bollo <jose.bollo@iot.bzh> --- - src/server/main/include/service-thread.h | 43 ++++++++++-------------- - 1 file changed, 18 insertions(+), 25 deletions(-) + src/server/main/include/service-thread.h | 42 ++++++++++-------------- + 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/src/server/main/include/service-thread.h b/src/server/main/include/service-thread.h -index 964d168..92b0ec8 100644 +index 964d168..61fdda8 100644 --- a/src/server/main/include/service-thread.h +++ b/src/server/main/include/service-thread.h -@@ -9,78 +94,72 @@ public: +@@ -94,7 +94,7 @@ public: Join(); while (!m_eventQueue.empty()){ auto front = m_eventQueue.front(); @@ -31,9 +31,7 @@ index 964d168..92b0ec8 100644 m_eventQueue.pop(); } } - - template <class T> - void Event(const T &event, +@@ -104,34 +104,28 @@ public: Service *servicePtr, void (Service::*serviceFunction)(const T &)) { @@ -59,30 +57,27 @@ index 964d168..92b0ec8 100644 - Service *servicePtr; - void (ServiceThread::*eventFunctionPtr)(const EventDescription &event); - GenericEvent* eventPtr; -- }; -- -- template <class T> ++ struct EventCallerBase { ++ virtual void fire() = 0; ++ virtual ~EventCallerBase() {} + }; + + template <class T> - void EventCall(const EventDescription &desc) { - auto fun = reinterpret_cast<void (Service::*)(const T&)>(desc.serviceFunctionPtr); - const T& eventLocale = *(static_cast<T*>(desc.eventPtr)); - (desc.servicePtr->*fun)(eventLocale); - } -+ struct EventCallerBase { -+ virtual void fire() = 0; -+ virtual ~EventCallerBase() {} -+ }; - -+ template <class T> + struct EventCaller : public EventCallerBase { + T *event; Service *target; void (Service::*function)(const T&); + EventCaller(const T &e, Service *c, void (Service::*f)(const T&)) : event(new T(e)), target(c), function(f) {} + ~EventCaller() { delete event; } + void fire() { (target->*function)(*event); } + }; -+ + static void ThreadLoopStatic(ServiceThread *ptr) { ptr->ThreadLoop(); - } +@@ -139,33 +133,33 @@ protected: void ThreadLoop(){ for (;;) { @@ -123,5 +118,5 @@ index 964d168..92b0ec8 100644 State m_state; -- -2.17.2 +2.21.0 diff --git a/meta-agl/meta-app-framework/recipes-core/security-manager/security-manager/Removing-tizen-platform-config.patch b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0013-Removing-tizen-platform-config.patch index bea3516d..fb621592 100644 --- a/meta-agl/meta-app-framework/recipes-core/security-manager/security-manager/Removing-tizen-platform-config.patch +++ b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0013-Removing-tizen-platform-config.patch @@ -1,33 +1,96 @@ -From 72e66d0e42f3bb6efd689ce33b1df407d94b3c60 Mon Sep 17 00:00:00 2001 +From 6c96a39ba7a7763ccd47e379dbfd8d376164985f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh> Date: Mon, 16 Nov 2015 14:26:25 +0100 -Subject: [PATCH] Removing tizen-platform-config +Subject: [PATCH 13/14] Removing tizen-platform-config Change-Id: Ic832a2b75229517b09faba969c27fb1a4b490121 --- - policy/security-manager-policy-reload | 2 +- - src/common/file-lock.cpp | 4 +--- - src/common/include/file-lock.h | 1 - - src/common/include/privilege_db.h | 3 +-- - src/common/service_impl.cpp | 39 +++++++++++------------------------ - src/common/smack-rules.cpp | 12 ++++------- - 6 files changed, 19 insertions(+), 42 deletions(-) + CMakeLists.txt | 16 +++++++- + db/CMakeLists.txt | 2 +- + policy/CMakeLists.txt | 1 + + ...load => security-manager-policy-reload.in} | 4 +- + src/common/file-lock.cpp | 4 +- + src/common/include/file-lock.h | 1 - + src/common/include/privilege_db.h | 3 +- + src/common/service_impl.cpp | 39 ++++++------------- + src/common/smack-rules.cpp | 12 ++---- + 9 files changed, 37 insertions(+), 45 deletions(-) + rename policy/{security-manager-policy-reload => security-manager-policy-reload.in} (94%) -diff --git a/policy/security-manager-policy-reload b/policy/security-manager-policy-reload -index 6f211c6..ed8047a 100755 +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 28790d8..37a43cc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -49,7 +49,7 @@ ADD_DEFINITIONS("-Wall") # Generate all warnings + ADD_DEFINITIONS("-Wextra") # Generate even more extra warnings + + STRING(REGEX MATCH "([^.]*)" API_VERSION "${VERSION}") +-ADD_DEFINITIONS("-DAPI_VERSION=\"$(API_VERSION)\"") ++ADD_DEFINITIONS("-DAPI_VERSION=\"${API_VERSION}\"") + + ADD_DEFINITIONS("-DSMACK_ENABLED") + +@@ -58,6 +58,20 @@ IF (CMAKE_BUILD_TYPE MATCHES "DEBUG") + ADD_DEFINITIONS("-DBUILD_TYPE_DEBUG") + ENDIF (CMAKE_BUILD_TYPE MATCHES "DEBUG") + ++SET(DATADIR "/usr/share/security-manager" CACHE STRING "path to data directory") ++SET(SMACKRULESDIR "/etc/smack/accesses.d" CACHE STRING "path to Smack rules directory") ++SET(LOCKDIR "/var/run/lock" CACHE STRING "path to lock directory") ++SET(DB_INSTALL_DIR "/var/db/security-manager" CACHE STRING "path to database directory") ++SET(DB_FILENAME ".security-manager.db" CACHE STRING "basename of database") ++SET(GLOBALUSER "userapp" CACHE STRING "name of the global user") ++ ++ADD_DEFINITIONS("-DDATADIR=\"${DATADIR}\"") ++ADD_DEFINITIONS("-DSMACKRULESDIR=\"${SMACKRULESDIR}\"") ++ADD_DEFINITIONS("-DLOCKDIR=\"${LOCKDIR}\"") ++ADD_DEFINITIONS("-DDB_INSTALL_DIR=\"${DB_INSTALL_DIR}\"") ++ADD_DEFINITIONS("-DDB_FILENAME=\"${DB_FILENAME}\"") ++ADD_DEFINITIONS("-DGLOBALUSER=\"${GLOBALUSER}\"") ++ + ADD_SUBDIRECTORY(src) + ADD_SUBDIRECTORY(pc) + ADD_SUBDIRECTORY(systemd) +diff --git a/db/CMakeLists.txt b/db/CMakeLists.txt +index 9e8ffcc..d7af1a0 100644 +--- a/db/CMakeLists.txt ++++ b/db/CMakeLists.txt +@@ -1,4 +1,4 @@ +-SET(TARGET_DB ".security-manager.db") ++SET(TARGET_DB "$(DB_FILENAME)") + + ADD_CUSTOM_COMMAND( + OUTPUT ${TARGET_DB} ${TARGET_DB}-journal +diff --git a/policy/CMakeLists.txt b/policy/CMakeLists.txt +index bd08edc..626a2bd 100644 +--- a/policy/CMakeLists.txt ++++ b/policy/CMakeLists.txt +@@ -1,4 +1,5 @@ + FILE(GLOB USERTYPE_POLICY_FILES usertype-*.profile) ++CONFIGURE_FILE(security-manager-policy-reload.in security-manager-policy-reload @ONLY) + INSTALL(FILES ${USERTYPE_POLICY_FILES} DESTINATION ${SHARE_INSTALL_PREFIX}/security-manager/policy) + INSTALL(FILES "app-rules-template.smack" DESTINATION ${SHARE_INSTALL_PREFIX}/security-manager/policy) + INSTALL(FILES "privilege-group.list" DESTINATION ${SHARE_INSTALL_PREFIX}/security-manager/policy) +diff --git a/policy/security-manager-policy-reload b/policy/security-manager-policy-reload.in +similarity index 94% +rename from policy/security-manager-policy-reload +rename to policy/security-manager-policy-reload.in +index 6f211c6..c1bc4e2 100755 --- a/policy/security-manager-policy-reload -+++ b/policy/security-manager-policy-reload -@@ -2,7 +2,7 @@ ++++ b/policy/security-manager-policy-reload.in +@@ -1,8 +1,8 @@ + #!/bin/sh -e - POLICY_PATH=/usr/share/security-manager/policy +-POLICY_PATH=/usr/share/security-manager/policy ++POLICY_PATH=@DATADIR@/policy PRIVILEGE_GROUP_MAPPING=$POLICY_PATH/privilege-group.list -DB_FILE=`tzplatform-get TZ_SYS_DB | cut -d= -f2`/.security-manager.db -+DB_FILE=/var/local/db/security-manager/.security-manager.db ++DB_FILE=@DB_INSTALL_DIR@/@DB_FILENAME@ # Create default buckets while read bucket default_policy diff --git a/src/common/file-lock.cpp b/src/common/file-lock.cpp -index 6f3996c..1dada17 100644 +index 6f3996c..88d2092 100644 --- a/src/common/file-lock.cpp +++ b/src/common/file-lock.cpp @@ -30,9 +30,7 @@ @@ -37,7 +100,7 @@ index 6f3996c..1dada17 100644 -char const * const SERVICE_LOCK_FILE = tzplatform_mkpath3(TZ_SYS_RUN, - "lock", - "security-manager.lock"); -+char const * const SERVICE_LOCK_FILE = "/var/run/lock/security-manager.lock"; ++char const * const SERVICE_LOCK_FILE = LOCKDIR "/security-manager.lock"; FileLocker::FileLocker(const std::string &lockFile, bool blocking) { @@ -54,11 +117,11 @@ index 604b019..21a86a0 100644 namespace SecurityManager { diff --git a/src/common/include/privilege_db.h b/src/common/include/privilege_db.h -index 4d73d90..03c6680 100644 +index 08fb9d6..3344987 100644 --- a/src/common/include/privilege_db.h +++ b/src/common/include/privilege_db.h -@@ -34,14 +34,13 @@ - #include <string> +@@ -35,14 +35,13 @@ + #include <vector> #include <dpl/db/sql_connection.h> -#include <tzplatform_config.h> @@ -69,12 +132,12 @@ index 4d73d90..03c6680 100644 namespace SecurityManager { -const char *const PRIVILEGE_DB_PATH = tzplatform_mkpath(TZ_SYS_DB, ".security-manager.db"); -+const char *const PRIVILEGE_DB_PATH = "/var/local/db/security-manager/.security-manager.db"; ++const char *const PRIVILEGE_DB_PATH = DB_INSTALL_DIR "/" DB_FILENAME; enum class QueryType { EGetPkgPrivileges, diff --git a/src/common/service_impl.cpp b/src/common/service_impl.cpp -index ae305d3..65cc8b5 100644 +index ae305d3..42150fe 100644 --- a/src/common/service_impl.cpp +++ b/src/common/service_impl.cpp @@ -32,7 +32,6 @@ @@ -94,7 +157,7 @@ index ae305d3..65cc8b5 100644 + if (!globaluid) { + struct passwd pw, *p; + char buf[4096]; -+ int rc = getpwnam_r("afm", &pw, buf, sizeof buf, &p); ++ int rc = getpwnam_r(GLOBALUSER, &pw, buf, sizeof buf, &p); + globaluid = (rc || p == NULL) ? 555 : p->pw_uid; + } return globaluid; @@ -144,7 +207,7 @@ index ae305d3..65cc8b5 100644 std::stringstream correctPath; diff --git a/src/common/smack-rules.cpp b/src/common/smack-rules.cpp -index d834e42..8b5728b 100644 +index 922a56f..c2e0041 100644 --- a/src/common/smack-rules.cpp +++ b/src/common/smack-rules.cpp @@ -34,7 +34,6 @@ @@ -160,7 +223,7 @@ index d834e42..8b5728b 100644 const char *const SMACK_APP_LABEL_TEMPLATE = "~APP~"; const char *const SMACK_PKG_LABEL_TEMPLATE = "~PKG~"; -const char *const APP_RULES_TEMPLATE_FILE_PATH = tzplatform_mkpath4(TZ_SYS_SHARE, "security-manager", "policy", "app-rules-template.smack"); -+const char *const APP_RULES_TEMPLATE_FILE_PATH = "/usr/share/security-manager/policy/app-rules-template.smack"; ++const char *const APP_RULES_TEMPLATE_FILE_PATH = DATADIR "/policy/app-rules-template.smack"; const char *const SMACK_APP_IN_PACKAGE_PERMS = "rwxat"; SmackRules::SmackRules() @@ -170,14 +233,14 @@ index d834e42..8b5728b 100644 { - std::string path(tzplatform_mkpath3(TZ_SYS_SMACK, "accesses.d", ("pkg_" + pkgId).c_str())); - return path; -+ return "/etc/smack/accesses.d/pkg_" + pkgId; ++ return SMACKRULESDIR "/pkg_" + pkgId; } std::string SmackRules::getApplicationRulesFilePath(const std::string &appId) { - std::string path(tzplatform_mkpath3(TZ_SYS_SMACK, "accesses.d", ("app_" + appId).c_str())); - return path; -+ return "/etc/smack/accesses.d/app_" + appId; ++ return SMACKRULESDIR "/app_" + appId; } void SmackRules::installApplicationPrivilegesRules(const std::string &appId, const std::string &pkgId, const std::vector<std::string> &pkgContents, const std::vector<std::string> &privileges) @@ -187,10 +250,10 @@ index d834e42..8b5728b 100644 continue; - std::string fprivilege ( privilege + "-template.smack"); - std::string path(tzplatform_mkpath4(TZ_SYS_SHARE, "security-manager", "policy", fprivilege.c_str())); -+ std::string path = "/usr/share/security-manager/policy/" + privilege + "-template.smack"; - if( stat(path.c_str(), &buffer) == 0) ++ std::string path = DATADIR "/policy/" + privilege + "-template.smack"; + if( stat(path.c_str(), &buffer) == 0) smackRules.addFromTemplateFile(appId, pkgId, path); } -- -2.1.4 +2.21.0 diff --git a/meta-agl/meta-security/recipes-security/security-manager/security-manager/0014-Ensure-post-install-initialization-of-database.patch b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0014-Ensure-post-install-initialization-of-database.patch new file mode 100644 index 00000000..542a387d --- /dev/null +++ b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0014-Ensure-post-install-initialization-of-database.patch @@ -0,0 +1,78 @@ +From c7f9d14e38a1b6d40b2fffa01433a3025eff9abd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh> +Date: Tue, 26 Nov 2019 12:34:39 +0100 +Subject: [PATCH 14/14] Ensure post install initialization of database +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Creation of the database was made during image creation, +leading to issue with SOTA. This adds the creation on +need before launching the service. + +Change-Id: Idfd0676bd87d39f7c10eaafd63f3a318f675c972 +Signed-off-by: José Bollo <jose.bollo@iot.bzh> +--- + db/CMakeLists.txt | 14 ++++++-------- + db/security-manager-setup | 14 ++++++++++++++ + systemd/security-manager.service.in | 1 + + 3 files changed, 21 insertions(+), 8 deletions(-) + create mode 100644 db/security-manager-setup + +diff --git a/db/CMakeLists.txt b/db/CMakeLists.txt +index d7af1a0..dcf5bc8 100644 +--- a/db/CMakeLists.txt ++++ b/db/CMakeLists.txt +@@ -1,12 +1,10 @@ +-SET(TARGET_DB "$(DB_FILENAME)") +- + ADD_CUSTOM_COMMAND( +- OUTPUT ${TARGET_DB} ${TARGET_DB}-journal +- COMMAND sqlite3 ${TARGET_DB} <db.sql +- ) ++ OUTPUT .security-manager-setup ++ COMMAND sed '/--DB\.SQL--/r db.sql' security-manager-setup > .security-manager-setup ++ DEPENDS security-manager-setup db.sql ++) + + # Add a dummy build target to trigger building of ${TARGET_DB} +-ADD_CUSTOM_TARGET(DB ALL DEPENDS ${TARGET_DB}) ++ADD_CUSTOM_TARGET(DB ALL DEPENDS .security-manager-setup) + +-INSTALL(FILES ${TARGET_DB} DESTINATION ${DB_INSTALL_DIR}) +-INSTALL(FILES ${TARGET_DB}-journal DESTINATION ${DB_INSTALL_DIR}) ++INSTALL(PROGRAMS .security-manager-setup DESTINATION ${BIN_INSTALL_DIR}) +diff --git a/db/security-manager-setup b/db/security-manager-setup +new file mode 100644 +index 0000000..5675baf +--- /dev/null ++++ b/db/security-manager-setup +@@ -0,0 +1,14 @@ ++#!/bin/sh ++ ++if test -f "$1"; then exit; fi ++set -e ++dbdir="$(dirname "$1")" ++dbfile="$(basename "$1")" ++test -n "$dbfile" ++test -n "$dbdir" ++mkdir -p "$dbdir" ++cd "$dbdir" ++sqlite3 "$dbfile" << END-OF-CAT ++--DB.SQL-- ++END-OF-CAT ++ +diff --git a/systemd/security-manager.service.in b/systemd/security-manager.service.in +index 23fd1b2..2bf97d7 100644 +--- a/systemd/security-manager.service.in ++++ b/systemd/security-manager.service.in +@@ -3,5 +3,6 @@ Description=Start the security manager + + [Service] + Type=notify ++ExecStartPre=@BIN_INSTALL_DIR@/.security-manager-setup @DB_INSTALL_DIR@/@DB_FILENAME@ + ExecStart=@BIN_INSTALL_DIR@/security-manager + Sockets=security-manager.socket +-- +2.21.0 + diff --git a/meta-agl/meta-security/recipes-security/security-manager/security-manager/0015-Restrict-socket-accesses.patch b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0015-Restrict-socket-accesses.patch new file mode 100644 index 00000000..d9949193 --- /dev/null +++ b/meta-agl/meta-security/recipes-security/security-manager/security-manager/0015-Restrict-socket-accesses.patch @@ -0,0 +1,34 @@ +From 7cffcd61378a9d7c0e7db5691b2da3a37448c969 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh> +Date: Thu, 30 Jan 2020 09:19:25 +0100 +Subject: [PATCH 15/15] Restrict socket accesses +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Ensure that only members of the group and the owner can access +the security manager. + +Bug-AGL: SPEC-3146 + +Change-Id: I68ce6523db4bfd4707c3680555c3cb0cf8858ef2 +Signed-off-by: José Bollo <jose.bollo@iot.bzh> +--- + systemd/security-manager.socket | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/systemd/security-manager.socket b/systemd/security-manager.socket +index af1c1da..b401f77 100644 +--- a/systemd/security-manager.socket ++++ b/systemd/security-manager.socket +@@ -1,6 +1,6 @@ + [Socket] + ListenStream=/run/security-manager.socket +-SocketMode=0777 ++SocketMode=0660 + SmackLabelIPIn=* + SmackLabelIPOut=@ + +-- +2.21.1 + diff --git a/meta-agl/meta-security/recipes-security/security-manager/security-manager/Removing-tizen-platform-config.patch b/meta-agl/meta-security/recipes-security/security-manager/security-manager/Removing-tizen-platform-config.patch deleted file mode 100644 index 4baea657..00000000 --- a/meta-agl/meta-security/recipes-security/security-manager/security-manager/Removing-tizen-platform-config.patch +++ /dev/null @@ -1,196 +0,0 @@ -From 72e66d0e42f3bb6efd689ce33b1df407d94b3c60 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh> -Date: Mon, 16 Nov 2015 14:26:25 +0100 -Subject: [PATCH] Removing tizen-platform-config - -Change-Id: Ic832a2b75229517b09faba969c27fb1a4b490121 ---- - policy/security-manager-policy-reload | 2 +- - src/common/file-lock.cpp | 4 +--- - src/common/include/file-lock.h | 1 - - src/common/include/privilege_db.h | 3 +-- - src/common/service_impl.cpp | 39 +++++++++++------------------------ - src/common/smack-rules.cpp | 12 ++++------- - 6 files changed, 19 insertions(+), 42 deletions(-) - -diff --git a/policy/security-manager-policy-reload b/policy/security-manager-policy-reload -index 6f211c6..ed8047a 100755 ---- a/policy/security-manager-policy-reload -+++ b/policy/security-manager-policy-reload -@@ -2,7 +2,7 @@ - - POLICY_PATH=/usr/share/security-manager/policy - PRIVILEGE_GROUP_MAPPING=$POLICY_PATH/privilege-group.list --DB_FILE=`tzplatform-get TZ_SYS_DB | cut -d= -f2`/.security-manager.db -+DB_FILE=/usr/dbspace/.security-manager.db - - # Create default buckets - while read bucket default_policy -diff --git a/src/common/file-lock.cpp b/src/common/file-lock.cpp -index 6f3996c..1dada17 100644 ---- a/src/common/file-lock.cpp -+++ b/src/common/file-lock.cpp -@@ -30,9 +30,7 @@ - - namespace SecurityManager { - --char const * const SERVICE_LOCK_FILE = tzplatform_mkpath3(TZ_SYS_RUN, -- "lock", -- "security-manager.lock"); -+char const * const SERVICE_LOCK_FILE = "/var/run/lock/security-manager.lock"; - - FileLocker::FileLocker(const std::string &lockFile, bool blocking) - { -diff --git a/src/common/include/file-lock.h b/src/common/include/file-lock.h -index 604b019..21a86a0 100644 ---- a/src/common/include/file-lock.h -+++ b/src/common/include/file-lock.h -@@ -29,7 +29,6 @@ - - #include <dpl/exception.h> - #include <dpl/noncopyable.h> --#include <tzplatform_config.h> - - namespace SecurityManager { - -diff --git a/src/common/include/privilege_db.h b/src/common/include/privilege_db.h -index 4d73d90..03c6680 100644 ---- a/src/common/include/privilege_db.h -+++ b/src/common/include/privilege_db.h -@@ -34,14 +34,13 @@ - #include <string> - - #include <dpl/db/sql_connection.h> --#include <tzplatform_config.h> - - #ifndef PRIVILEGE_DB_H_ - #define PRIVILEGE_DB_H_ - - namespace SecurityManager { - --const char *const PRIVILEGE_DB_PATH = tzplatform_mkpath(TZ_SYS_DB, ".security-manager.db"); -+const char *const PRIVILEGE_DB_PATH = "/usr/dbspace/.security-manager.db"; - - enum class QueryType { - EGetPkgPrivileges, -diff --git a/src/common/service_impl.cpp b/src/common/service_impl.cpp -index ae305d3..65cc8b5 100644 ---- a/src/common/service_impl.cpp -+++ b/src/common/service_impl.cpp -@@ -32,7 +32,6 @@ - #include <algorithm> - - #include <dpl/log/log.h> --#include <tzplatform_config.h> - - #include "protocols.h" - #include "privilege_db.h" -@@ -131,7 +130,13 @@ static inline int validatePolicy(policy_entry &policyEntry, std::string uidStr, - - static uid_t getGlobalUserId(void) - { -- static uid_t globaluid = tzplatform_getuid(TZ_SYS_GLOBALAPP_USER); -+ static uid_t globaluid = 0; -+ if (!globaluid) { -+ struct passwd pw, *p; -+ char buf[4096]; -+ int rc = getpwnam_r("userapp", &pw, buf, sizeof buf, &p); -+ globaluid = (rc || p == NULL) ? 555 : p->pw_uid; -+ } - return globaluid; - } - -@@ -161,37 +166,17 @@ static inline bool isSubDir(const char *parent, const char *subdir) - - static bool getUserAppDir(const uid_t &uid, std::string &userAppDir) - { -- struct tzplatform_context *tz_ctx = nullptr; -- -- if (tzplatform_context_create(&tz_ctx)) -- return false; -- -- if (tzplatform_context_set_user(tz_ctx, uid)) { -- tzplatform_context_destroy(tz_ctx); -- tz_ctx = nullptr; -+ struct passwd pw, *p; -+ char buf[4096]; -+ int rc = getpwuid_r(uid, &pw, buf, sizeof buf, &p); -+ if (rc || p == NULL) - return false; -- } -- -- enum tzplatform_variable id = -- (uid == getGlobalUserId()) ? TZ_SYS_RW_APP : TZ_USER_APP; -- const char *appDir = tzplatform_context_getenv(tz_ctx, id); -- if (!appDir) { -- tzplatform_context_destroy(tz_ctx); -- tz_ctx = nullptr; -- return false; -- } -- -- userAppDir = appDir; -- -- tzplatform_context_destroy(tz_ctx); -- tz_ctx = nullptr; -- -+ userAppDir = p->pw_dir; - return true; - } - - static inline bool installRequestAuthCheck(const app_inst_req &req, uid_t uid, bool &isCorrectPath, std::string &appPath) - { -- std::string userHome; - std::string userAppDir; - std::stringstream correctPath; - -diff --git a/src/common/smack-rules.cpp b/src/common/smack-rules.cpp -index d834e42..8b5728b 100644 ---- a/src/common/smack-rules.cpp -+++ b/src/common/smack-rules.cpp -@@ -34,7 +34,6 @@ - #include <memory> - - #include <dpl/log/log.h> --#include <tzplatform_config.h> - - #include "smack-labels.h" - #include "smack-rules.h" -@@ -43,7 +42,7 @@ namespace SecurityManager { - - const char *const SMACK_APP_LABEL_TEMPLATE = "~APP~"; - const char *const SMACK_PKG_LABEL_TEMPLATE = "~PKG~"; --const char *const APP_RULES_TEMPLATE_FILE_PATH = tzplatform_mkpath4(TZ_SYS_SHARE, "security-manager", "policy", "app-rules-template.smack"); -+const char *const APP_RULES_TEMPLATE_FILE_PATH = "/usr/share/security-manager/policy/app-rules-template.smack"; - const char *const SMACK_APP_IN_PACKAGE_PERMS = "rwxat"; - - SmackRules::SmackRules() -@@ -237,14 +236,12 @@ void SmackRules::generatePackageCrossDeps(const std::vector<std::string> &pkgCon - - std::string SmackRules::getPackageRulesFilePath(const std::string &pkgId) - { -- std::string path(tzplatform_mkpath3(TZ_SYS_SMACK, "accesses.d", ("pkg_" + pkgId).c_str())); -- return path; -+ return "/etc/smack/accesses.d/pkg_" + pkgId; - } - - std::string SmackRules::getApplicationRulesFilePath(const std::string &appId) - { -- std::string path(tzplatform_mkpath3(TZ_SYS_SMACK, "accesses.d", ("app_" + appId).c_str())); -- return path; -+ return "/etc/smack/accesses.d/app_" + appId; - } - void SmackRules::installApplicationPrivilegesRules(const std::string &appId, const std::string &pkgId, - const std::vector<std::string> &pkgContents, const std::vector<std::string> &privileges) -@@ -256,8 +253,7 @@ void SmackRules::installApplicationPrivilegesRules(const std::string &appId, con - for (auto privilege : privileges) { - if (privilege.empty()) - continue; -- std::string fprivilege ( privilege + "-template.smack"); -- std::string path(tzplatform_mkpath4(TZ_SYS_SHARE, "security-manager", "policy", fprivilege.c_str())); -+ std::string path = "/usr/share/security-manager/policy/" + privilege + "-template.smack"; - if( stat(path.c_str(), &buffer) == 0) - smackRules.addFromTemplateFile(appId, pkgId, path); - } --- -2.1.4 - diff --git a/meta-agl/meta-security/recipes-security/security-manager/security-manager/include-linux-xattr.patch b/meta-agl/meta-security/recipes-security/security-manager/security-manager/include-linux-xattr.patch deleted file mode 100644 index 33fbc025..00000000 --- a/meta-agl/meta-security/recipes-security/security-manager/security-manager/include-linux-xattr.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: José Bollo <jose.bollo@iot.bzh> -Date: Tue, 30 Oct 2015 14:32:03 -0100 -Subject: [PATCH] include linux xattr - -adds a #include <linux/xattr.h> in source. - ---- - src/client/client-security-manager.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/client/client-security-manager.cpp b/src/client/client-security-manager.cpp -index 74a6b30..641790b 100644 ---- a/src/client/client-security-manager.cpp -+++ b/src/client/client-security-manager.cpp -@@ -34,6 +34,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/xattr.h> -+#include <linux/xattr.h> - #include <sys/smack.h> - #include <sys/capability.h> - --- -2.1.4 diff --git a/meta-agl/meta-security/recipes-security/security-manager/security-manager/libcap-without-pkgconfig.patch b/meta-agl/meta-security/recipes-security/security-manager/security-manager/libcap-without-pkgconfig.patch deleted file mode 100644 index a948343f..00000000 --- a/meta-agl/meta-security/recipes-security/security-manager/security-manager/libcap-without-pkgconfig.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: José Bollo <jose.bollo@iot.bzh> -Date: Tue, 30 Oct 2015 14:32:03 -0100 -Subject: [PATCH] libcap without pkgconfig - -Handles libcap that isn't distributed for pkg-config - ---- - src/client/CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt -index 5399a55..0250ce2 100644 ---- a/src/client/CMakeLists.txt -+++ b/src/client/CMakeLists.txt -@@ -1,7 +1,6 @@ - PKG_CHECK_MODULES(CLIENT_DEP - REQUIRED - libsmack -- libcap - ) - - SET(CLIENT_VERSION_MAJOR 1) -@@ -37,6 +36,7 @@ SET_TARGET_PROPERTIES(${TARGET_CLIENT} - TARGET_LINK_LIBRARIES(${TARGET_CLIENT} - ${TARGET_COMMON} - ${CLIENT_DEP_LIBRARIES} -+ cap - ) - - INSTALL(TARGETS ${TARGET_CLIENT} DESTINATION ${LIB_INSTALL_DIR}) --- -2.1.4 diff --git a/meta-agl/meta-security/recipes-security/security-manager/security-manager_git.bb b/meta-agl/meta-security/recipes-security/security-manager/security-manager_git.bb index 3cbc3aea..b3497351 100644 --- a/meta-agl/meta-security/recipes-security/security-manager/security-manager_git.bb +++ b/meta-agl/meta-security/recipes-security/security-manager/security-manager_git.bb @@ -6,32 +6,21 @@ SRC_URI += "git://github.com/Samsung/security-manager.git" S = "${WORKDIR}/git" SRC_URI += " \ -file://systemd-stop-using-compat-libs.patch \ -file://security-manager-policy-reload-do-not-depend-on-GNU-.patch \ -file://0001-Smack-rules-create-two-new-functions.patch \ -file://0002-app-install-implement-multiple-set-of-smack-rules.patch \ -file://c-11-replace-depracated-auto_ptr.patch \ -file://socket-manager-removes-tizen-specific-call.patch \ -file://Removing-tizen-platform-config.patch \ -file://removes-dependency-to-libslp-db-utils.patch \ -file://0001-Fix-gcc8-warning-error-Werror-catch-value.patch \ -file://0001-Avoid-casting-from-const-T-to-void.patch \ -" - -########################################## -# This are patches for backward compatibility to the version dizzy of poky. -# The dizzy version of libcap isn't providing a packconfig file. -# This is solved by the patch libcap-without-pkgconfig.patch. -# But after solving that issue, it appears that linux/xattr.h should -# also be include add definitions of XATTR_NAME_SMACK... values. -# Unfortunately, there is no explanation why linux/xattr.h should -# also be included (patch include-linux-xattr.patch) -########################################## -do_patch[depends] = "libcap:do_populate_sysroot" -APPLY = "${@str('no' if os.path.exists('${STAGING_LIBDIR}/pkgconfig/libcap.pc') else 'yes')}" -SRC_URI += "\ - file://libcap-without-pkgconfig.patch;apply=${APPLY} \ - file://include-linux-xattr.patch;apply=${APPLY} \ + file://0001-systemd-stop-using-compat-libs.patch \ + file://0002-security-manager-policy-reload-do-not-depend-on-GNU-.patch \ + file://0003-Smack-rules-create-two-new-functions.patch \ + file://0004-app-install-implement-multiple-set-of-smack-rules.patch \ + file://0005-c-11-replace-deprecated-auto_ptr.patch \ + file://0006-socket-manager-removes-tizen-specific-call.patch \ + file://0007-removes-dependency-to-libslp-db-utils.patch \ + file://0008-Fix-gcc6-build.patch \ + file://0009-Fix-Cmake-conf-for-gcc6-build.patch \ + file://0010-gcc-7-requires-include-functional-for-std-function.patch \ + file://0011-Fix-gcc8-warning-error-Werror-catch-value.patch \ + file://0012-Avoid-casting-from-const-T-to-void.patch \ + file://0013-Removing-tizen-platform-config.patch \ + file://0014-Ensure-post-install-initialization-of-database.patch \ + file://0015-Restrict-socket-accesses.patch \ " # Use make with cmake and not ninja diff --git a/meta-agl/templates/base/conf-notes.txt b/meta-agl/templates/base/conf-notes.txt index 1279e297..02e04678 100644 --- a/meta-agl/templates/base/conf-notes.txt +++ b/meta-agl/templates/base/conf-notes.txt @@ -1,17 +1,26 @@ Common targets are: - meta-agl: (core system) - agl-image-minimal - agl-image-minimal-qa - - agl-image-ivi + - agl-profile-core: + agl-image-boot + agl-image-minimal + agl-image-minimal-qa + + - agl-profile-graphical: + agl-image-weston + + - agl-profile-graphical-qt5: + agl-image-graphical-qt5 + agl-image-graphical-qt5-crosssdk + + - agl-profile-graphical-html5 + agl-demo-platform-html5 + + - meta-agl-demo: (demo with UI) + agl-image-ivi (base for ivi targets) agl-image-ivi-qa agl-image-ivi-crosssdk - - agl-image-weston - - meta-agl-demo: (demo with UI) agl-demo-platform (* default demo target) agl-demo-platform-qa agl-demo-platform-crosssdk - - agl-demo-platform-html5 + diff --git a/meta-agl/templates/feature/agl-ci-change-features-nogfx/included.dep b/meta-agl/templates/feature/agl-ci-change-features-nogfx/included.dep index 759f4792..c0e72005 100644 --- a/meta-agl/templates/feature/agl-ci-change-features-nogfx/included.dep +++ b/meta-agl/templates/feature/agl-ci-change-features-nogfx/included.dep @@ -1 +1 @@ -agl-devel agl-netboot agl-pipewire agl-buildstats agl-ptest
\ No newline at end of file +agl-demo agl-devel agl-netboot agl-pipewire agl-buildstats agl-ptest
\ No newline at end of file diff --git a/meta-agl/templates/feature/agl-ci-snapshot-features-nogfx/included.dep b/meta-agl/templates/feature/agl-ci-snapshot-features-nogfx/included.dep index b8184837..01ef6c81 100644 --- a/meta-agl/templates/feature/agl-ci-snapshot-features-nogfx/included.dep +++ b/meta-agl/templates/feature/agl-ci-snapshot-features-nogfx/included.dep @@ -1 +1 @@ -agl-devel agl-netboot agl-archiver agl-pipewire agl-buildstats agl-ptest +agl-demo agl-devel agl-netboot agl-archiver agl-pipewire agl-buildstats agl-ptest diff --git a/meta-agl/templates/feature/agl-compositor/50_local.conf.inc b/meta-agl/templates/feature/agl-compositor/50_local.conf.inc new file mode 100644 index 00000000..4bddfb6e --- /dev/null +++ b/meta-agl/templates/feature/agl-compositor/50_local.conf.inc @@ -0,0 +1,15 @@ +DISTRO_FEATURES_append = " agl-compositor" + +# note that these are for testing only, should be removed once the changes +# land in their respective repositories + +# shell client +AGL_BRANCH_pn-homescreen = "sandbox/mvlad/agl-compositor" +DEPENDS_append_pn-homescreen = " wayland-native wayland qtwayland qtwayland-native" + +# normal apps +AGL_BRANCH_pn-launcher = "sandbox/mvlad/agl-compositor" +AGL_BRANCH_pn-hvac = "sandbox/mvlad/agl-compositor" +DEPENDS_append_pn-hvac = " libafb-helpers-qt" +AGL_BRANCH_pn-navigation-demo = "sandbox/mvlad/agl-compositor" +AGL_BRANCH_pn-mediaplayer = "sandbox/mvlad/agl-compositor" diff --git a/meta-agl/templates/feature/agl-compositor/README_feature_agl-compositor.md b/meta-agl/templates/feature/agl-compositor/README_feature_agl-compositor.md new file mode 100644 index 00000000..4b5211ee --- /dev/null +++ b/meta-agl/templates/feature/agl-compositor/README_feature_agl-compositor.md @@ -0,0 +1,13 @@ +--- +description: Feature agl-compositor +authors: Daniel Stone <daniels@collabora.com> +--- + +### Feature agl-compositor + +_agl-compositor_ is a new Wayland display server framework, based on the +existing libweston library. It provides AGL users an extensible framework for +window/input/output management within the display server. + +It is included as a technology preview, and is not currently ready for +production use. diff --git a/meta-agl/templates/feature/agl-profile-graphical-html5/50_bblayers.conf.inc b/meta-agl/templates/feature/agl-profile-graphical-html5/50_bblayers.conf.inc deleted file mode 100644 index 97b44a21..00000000 --- a/meta-agl/templates/feature/agl-profile-graphical-html5/50_bblayers.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -BBLAYERS =+ " \ - ${METADIR}/meta-agl/meta-agl-profile-graphical-html5 \ -" diff --git a/meta-agl/templates/feature/agl-profile-graphical-html5/README_feature_agl-profile-graphical-html5.md b/meta-agl/templates/feature/agl-profile-graphical-html5/README_feature_agl-profile-graphical-html5.md deleted file mode 100644 index 48bf84b0..00000000 --- a/meta-agl/templates/feature/agl-profile-graphical-html5/README_feature_agl-profile-graphical-html5.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -description: Feature agl-profile-graphical-html5 -authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org> ---- - -### Feature agl-profile-graphical-html5 - -*Description is missing - please complete file meta-agl/templates/feature/agl-profile-graphical-html5/README_feature_agl-profile-graphical-html5.md* - -#### Dependent features pulled by agl-profile-graphical-html5 - -The following features are pulled: - -* agl-profile-graphical - diff --git a/meta-agl/templates/feature/agl-profile-graphical-html5/included.dep b/meta-agl/templates/feature/agl-profile-graphical-html5/included.dep deleted file mode 100644 index 5b54430d..00000000 --- a/meta-agl/templates/feature/agl-profile-graphical-html5/included.dep +++ /dev/null @@ -1 +0,0 @@ -agl-profile-graphical
\ No newline at end of file diff --git a/meta-agl/templates/feature/agl-sota/50_bblayers.conf.inc b/meta-agl/templates/feature/agl-sota/50_bblayers.conf.inc index 67c41d23..48655fdc 100644 --- a/meta-agl/templates/feature/agl-sota/50_bblayers.conf.inc +++ b/meta-agl/templates/feature/agl-sota/50_bblayers.conf.inc @@ -1,6 +1,5 @@ BBLAYERS =+ " \ ${METADIR}/external/meta-updater \ - ${METADIR}/external/meta-updater-qemux86-64 \ ${METADIR}/external/meta-openembedded/meta-filesystems \ ${METADIR}/external/meta-openembedded/meta-python \ " diff --git a/meta-agl/templates/feature/agl-sota/50_local.conf.inc b/meta-agl/templates/feature/agl-sota/50_local.conf.inc index 509cf612..35ab3f9a 100644 --- a/meta-agl/templates/feature/agl-sota/50_local.conf.inc +++ b/meta-agl/templates/feature/agl-sota/50_local.conf.inc @@ -2,3 +2,9 @@ INHERIT += "sota" DISTRO_FEATURES_append = " sota usrmerge" DISTRO_FEATURES_NATIVE_append = " sota" +AGL_DEFAULT_INITRAMFS_FSTYPES = "cpio.gz" +# rpi4 and recent rpi3 firmwares need dtb in /boot partition +# so that they can be read by the firmware. This fixes UART +# issues for Raspberry Pi 3. For branches based on release +# Thud this fix is not present in meta-updater. +IMAGE_BOOT_FILES_append_rpi = "${@make_dtb_boot_files(d)}" diff --git a/meta-agl/templates/feature/agl-sota/50_setup.sh b/meta-agl/templates/feature/agl-sota/50_setup.sh new file mode 100644 index 00000000..f209b944 --- /dev/null +++ b/meta-agl/templates/feature/agl-sota/50_setup.sh @@ -0,0 +1,26 @@ + +cat <<EOF >> ${BUILDDIR}/conf/bblayers.conf + +# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # +# fragment { +# ${METADIR}/meta-agl/templates/feature/agl-sota/50_setup.sh +# +EOF + +case ${MACHINE} in + "qemux86-64") + echo "BBLAYERS =+ \"\${METADIR}/external/meta-updater-qemux86-64\"" >> ${BUILDDIR}/conf/bblayers.conf;; + "raspberrypi3" | "raspberrypi4") + echo "BBLAYERS =+ \"\${METADIR}/external/meta-updater-raspberrypi\"" >> ${BUILDDIR}/conf/bblayers.conf;; + *) + echo "#No extra SOTA feature layer for MACHINE ${MACHINE}" >> ${BUILDDIR}/conf/bblayers.conf;; +esac + + +cat <<EOF >> ${BUILDDIR}/conf/bblayers.conf + +# +# } +# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # + +EOF diff --git a/meta-agl/templates/feature/agl-virt-xen/50_local.conf.inc b/meta-agl/templates/feature/agl-virt-xen/50_local.conf.inc new file mode 100644 index 00000000..48f4b2b7 --- /dev/null +++ b/meta-agl/templates/feature/agl-virt-xen/50_local.conf.inc @@ -0,0 +1,3 @@ +# Set Xen flag + +AGL_XEN_WANTED = "1" diff --git a/meta-agl/templates/feature/agl-virt-xen/included.dep b/meta-agl/templates/feature/agl-virt-xen/included.dep new file mode 100644 index 00000000..e4acef2b --- /dev/null +++ b/meta-agl/templates/feature/agl-virt-xen/included.dep @@ -0,0 +1 @@ +agl-virt diff --git a/meta-agl/templates/feature/agl-virt/50_bblayers.conf.inc b/meta-agl/templates/feature/agl-virt/50_bblayers.conf.inc new file mode 100644 index 00000000..04d31a22 --- /dev/null +++ b/meta-agl/templates/feature/agl-virt/50_bblayers.conf.inc @@ -0,0 +1,3 @@ +BBLAYERS =+ " \ + ${METADIR}/external/meta-virtualization \ + " diff --git a/meta-agl/templates/feature/agl-virt/50_local.conf.inc b/meta-agl/templates/feature/agl-virt/50_local.conf.inc new file mode 100644 index 00000000..c15b8316 --- /dev/null +++ b/meta-agl/templates/feature/agl-virt/50_local.conf.inc @@ -0,0 +1,3 @@ +# meta-virtualization needs the "virtualization in DISTRO_FEATURES + +DISTRO_FEATURES_append = " virtualization" diff --git a/meta-agl/templates/machine/ebisu/50_setup.sh b/meta-agl/templates/machine/ebisu/50_setup.sh index c8471ae0..502c2275 100644 --- a/meta-agl/templates/machine/ebisu/50_setup.sh +++ b/meta-agl/templates/machine/ebisu/50_setup.sh @@ -19,7 +19,10 @@ fi if [ -f $COPY_SCRIPT ]; then # Extract the ZIP into the tmp directory mkdir -p $EXTRACT_DIR - unzip -q -o $EBISU_BIN_PATH/*.zip -d $EXTRACT_DIR + for PROPRIETARY_BIN in `ls -1 $EBISU_BIN_PATH/*.zip` + do + unzip -q -o $PROPRIETARY_BIN -d $EXTRACT_DIR + done cd $METADIR/bsp/meta-renesas-rcar-gen3/ $COPY_SCRIPT $EXTRACT_DIR diff --git a/meta-agl/templates/machine/raspberrypi3/50_local.conf.inc b/meta-agl/templates/machine/raspberrypi3/50_local.conf.inc index dcaf5e9d..e4763717 100644 --- a/meta-agl/templates/machine/raspberrypi3/50_local.conf.inc +++ b/meta-agl/templates/machine/raspberrypi3/50_local.conf.inc @@ -1,7 +1,3 @@ MACHINE = "raspberrypi3" #see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc require conf/include/agl_raspberrypi3.inc - -# Set appropriate version of Mesa for Raspberry Pi 3 and -# ignore the newer version with has been added for Raspberry Pi 4 -PREFERRED_VERSION_mesa_raspberrypi3 = "18.1%" diff --git a/meta-agl/templates/machine/raspberrypi4/50_local.conf.inc b/meta-agl/templates/machine/raspberrypi4/50_local.conf.inc index 27a8bf2a..4c14d14b 100644 --- a/meta-agl/templates/machine/raspberrypi4/50_local.conf.inc +++ b/meta-agl/templates/machine/raspberrypi4/50_local.conf.inc @@ -2,7 +2,7 @@ MACHINE = "raspberrypi4" #see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc require conf/include/agl_raspberrypi3.inc -PREFERRED_VERSION_linux-raspberrypi_raspberrypi4 = "4.19%" - -# Set appropriate version of Mesa for Raspberry Pi 4 -PREFERRED_VERSION_mesa_raspberrypi4 = "19.1%" +#use the "Image" format for 64-bit AGL image for Raspberry Pi 4 +KERNEL_IMAGETYPE = "Image" +KERNEL_IMAGETYPE_UBOOT = "Image" +KERNEL_IMAGETYPE_DIRECT = "Image" |