...
 
Commits (12)
  • Enrico Scholz's avatar
    updated submodules · fe6d23da
    Enrico Scholz authored
    * sources/de.sigma-chemnitz.core b22cd91...327f581 (20):
      > Merge branch 'master' into zeus-next
      > Merge branch 'master'
      > Merge branch 'master'
      > systemd: added fix for NFS root
      > systemd: updated
      > fbgrab: fixed typo
      < Merge branch 'master' into warrior-next
      < Merge branch 'master-next' into warrior-next
      < Merge branch 'master' into warrior-next
      < packagroup-ci: added tests for our changes
      < qemu: backported upstream fix
      < Merge branch 'master' into warrior-next
      < Merge branch 'master' into warrior-next
      < Merge branch 'master' into warrior-next
      < Merge branch 'master' into warrior-next
      < Merge branch 'master-next' into warrior-next
      < packagegroup-ci: do not build valgrind
      < valgrind: removed patch; applied in oe already
      < Revert "systemd: updated"
      < Revert "valgrind: removed fix"
    
    * sources/de.sigma-chemnitz.vm016-mx8m 7c1c328...9af16dd (18):
      > CI: initial checkin
      > qtmultimedia: enable gstreamer support
      > misc: added qt5 profile
      > meta-devel: inherit COMPAT from parent
      > kernel: updated mx8m media patch
      > layer: updated to zeus
      > examples: added 'cam' example
      > gstreamer1.0-plugins-bayer2rgbneon: fixed autodetection
      > gstreamer1.0-plugins-bad: added bayer2rgb compatibility patch
      > kernel: updated patchset
      > devel: set static ethernet mac address
      > devel: install network script
      > kerenl: updated patchsets
      > kernel: updated
      > gstreamer: disabled opencv
      > busybox: disabled 'i2ctransfer' due to conflicts
      > kernel: added some backported patches
      > libdrm: updated and moved into dynamic layer
    
    * sources/meta-freescale 2142f7de...0be39721 (304):
      > linux-fslc-imx_4.9: resolve version for cve scans
      > linux-fslc-imx_4.9-1.0.x: replace patchset to the one from stable
      > aiopsl: fix missing path
      > t4240rdb-64b: update UBOOT_CONFIG
      > t4240rdb : update UBOOT_CONFIG
      > t2080rdb-64b : update UBOOT_CONFIG
      > t2080rdb : update UBOOT_CONFIG
      > t1042d4rdb: update UBOOT_CONFIG
      > t1042d4rdb-64b: update UBOOT_CONFIG
      > t1024rdb: update UBOOT_CONFIG
      > t1024rdb-64b: update UBOOT_CONFIG
      > p5040ds-64b: update UBOOT_CONFIG
      > p5040ds: update UBOOT_CONFIG
      > p4080ds: update UBOOT_CONFIG
      > p3041ds: update UBOOT_CONFIG
      > p2041rdb: update UBOOT_CONFIG
      > p2020rdb: update UBOOT_CONFIG
      > p1020rdb: update UBOOT_CONFIG
      > mpc8548cds: update UBOOT_CONFIG
      > weston-init: Keep the logic to edit weston.ini to meta-freescale
    
    * sources/meta-openembedded 3bdbf72e3...aad5b3d07 (1296):
      > README: updated Maintainers list for Zeus
      > packagegroup-meta-multimedia: Remove libsquish from rdeps
      > tinyalsa: Update to latest
      > rsyslog: fix CVE-2019-17040
      > lvm2: remove unsupported OPTIONS+="event_timeout" rule
      > a2jmidid: Fix build on risv
      > bdwgc: Enable C++ support and Additional options for musl
      > jsonrpc: Disable coverage in default build
      > networkd-dispatcher: inherit systemd class
      > networkd-dispatcher: remove unneeded RDEPENDS
      > networkd-dispatcher: use distro_features_check to check for systemd
      > python-jinja2: upgrade 2.10.1 -> 2.10.3
      > python-cmd2: upgrade 0.9.17 -> 0.9.18
      > lua: change a hard readline dependency into an optional one
      > kconfig-frontends: Retrieve the Git repository from GitLab
      > xfce4-panel: upgrade 4.14.0 -> 4.14.1
      > python-beautifulsoup4: upgrade 4.8.0 -> 4.8.1
      > python-attrs: upgrade 19.1.0 -> 19.2.0
      > rwmem: add DESCRIPTION since the summary is vague
      > mosquitto: update to 1.6.7
    
    * sources/meta-phytec 1690713a...54444397 (128):
      > u-boot-imx: imx8m: Update recipe version to v2018.03-phy3
      > linux-imx: imx8: Update recipe version to 4.14.98-phy4
      > imx-sc-firmware: move recipe to dynamic-layers
      > recipes-bsp: firmware: Update the recipe
      > brcm-patchram-plus: fix rebuild
      > recipes-bsp: imx-sc-firmware: Add imx-sc-firmware recipe
      > conf: machine: phycore-imx8-2: Update firmware package name
      > conf: machine: imx8: Create phyimx8 include
      > scrips: init: Remove meta-filesystems
      > scripts: wic: imx8*-sdimage.wks.in: Rename sourceparams
      > dynmaic-layers: imx-boot: Update recipe for warrior
      > recipes-bsp: u-boot-imx: Don't deploy mkimage
      > nxp-cst: add actual NXP cst tool version 3.2.0 with i.MX8 support
      > nxp-cst: cleaning for compatibility with newer NXP cst tool versions
      > recipes-bsp: u-boot: change version of bbappend-file
      > Revert "recipes-graphics: drm: use new libdrm 2.4.89 on mx6"
      > machine: Fix SERIAL_CONSOLES entry
      > recipes-devtools: add serialcheck
      > recipes-kernel: linux: license file changed with newer kernel version
      > machine: Add support for phyBOARD-Polis-i.MX8MM
    
    * sources/meta-qt5 dc2dede...432ad2a (35):
      > qttools: don't install tst_qtattributionsscanner
      > qt5: Upgrade to Qt 5.13.2
      > python(3)-pyqt5: add qml support
      > libqofono: bump SRCREV and add a fix for voicecall
      > qtbase: Add PACKAGECONFIG for lttng
      > layer: Mark zeus as compatible release
      > ogl-runtime: Fix build on x86_64
      > README.md: Document need for 32bit host compiler
      > qtwayland: Fix build with clang/libc++
      > qtbase: Fix build when fp16 is used
      > qt3d-runtime: update to ogl-runtime v2.4
      > qtvirtualkeyboard: update supported layouts
      > qt5-creator: Fix clangformat with clang 9.x
      < qtserialbus: Fix build with 5.2+ kernel headers
      < qtwebengine: Fix compile failure with 5.2+ kernel headers
      > qttools: Add CONFIG+=config_clang_done when not building with clang
      > qtwebengine: Fix compile failure with 5.2+ kernel headers
      > qtserialbus: Fix build with 5.2+ kernel headers
      > qtwebengine: Add pulseaudio support
      > qtwebengine: Rename jasoncpp to jsoncpp
    
    * sources/meta-yogurt dcd1df1...1383df1 (100):
      > packagegroup-gstreamer: Change imx8m specific examples
      > recipes-multimedia: Update phytec-gstreamer-examples-imx8m
      > recipes-examples: update phytec-v4l2-c-examples-imx8m
      > packagegroup-gstreamer: add some plugins to imx8m
      > core: rauc: Add dummy system_emmc.conf for i.MX8
      > conf: distro: add missing name-variables
      > conf: distro: manage distros hierarchically
      > recipes-multimedia: Add phytec-gstreamer-examples-imx8m
      > recipes-examples: add phytec-v4l2-c-examples-imx8m
      > distro: add new yogurt-vendor-wayland distro
      > phytec-qt5demo-image: change DISTRO_FEATURE handling
      > images: phytec-vision-image: add weston-xwayland
      > wayland: westin-init: create weston-init.bbappend
      > core: rauc: Add dummy system_emmc.conf for i.MX8MM
      > packagegroup-gstreamer: add RDPENDS for imx8m
      > core: rauc: Add dummy system_emmc.conf for i.MX8M
      > phytec-vision-image: Add yvata
      > distro: yogurt-vendor-xwayland: add new distro yogurt-vendor-xwayland
      > distro: yogurt-vendor: manage DISTRO_FEATURES another way
      > phytec-vision-image: check DISTRO_FEATURES for wayland
    
    * sources/poky 6d2e12e792...5d50b0549e (2367):
      > bitbake: runqueue.py: not show warning for deferred multiconfig task
      > build-appliance-image: Update to zeus head revision
      > bitbake: tests/runqueue: Fix to match recent task migration fixes
      > build-appliance-image: Update to zeus head revision
      > build-appliance: Use zeus as the branch
      > build-appliance-image: Update to zeus head revision
      > poky.conf: Bump version for 3.0.1 zeus release
      > gstreamer: Change SRC_URI to use HTTPS access instead of HTTP
      > gst-validate: upgrade to version 1.16.1
      > gstreamer1.0-rtsp-server: upgrade to version 1.16.1
      > gstreamer1.0-python: upgrade to version 1.16.1
      > gstreamer1.0-omx: upgrade to version 1.16.1
      > gstreamer1.0-vaapi: upgrade to version 1.16.1
      > gstreamer1.0-libav: upgrade to version 1.16.1
      > gstreamer1.0-plugins-ugly: upgrade to version 1.16.1
      > gstreamer1.0-plugins-bad: upgrade to version 1.16.1
      > gstreamer1.0-plugins-good: upgrade to version 1.16.1
      > gstreamer1.0-plugins-base: upgrade to version 1.16.1
      > gstreamer1.0: upgrade to version 1.16.1
      > bind: fix CVE-2019-6471 and CVE-2018-5743
    fe6d23da
  • Enrico Scholz's avatar
  • Enrico Scholz's avatar
    updated to 'zeus' · 3e7a299c
    Enrico Scholz authored
    Signed-off-by: Enrico Scholz's avatarEnrico Scholz <enrico.scholz@sigma-chemnitz.de>
    3e7a299c
  • Enrico Scholz's avatar
    610dadc6
  • Enrico Scholz's avatar
    local: use USER_CLASSES, not INHERIT · 10ea4a49
    Enrico Scholz authored
    10ea4a49
  • Enrico Scholz's avatar
    local: added sstate-server support · 608431eb
    Enrico Scholz authored
    608431eb
  • Enrico Scholz's avatar
    layers: added meta-qt5 · ea45b483
    Enrico Scholz authored
    Signed-off-by: Enrico Scholz's avatarEnrico Scholz <enrico.scholz@sigma-chemnitz.de>
    ea45b483
  • Enrico Scholz's avatar
    layers: updated to zeus · 97128b94
    Enrico Scholz authored
    Signed-off-by: Enrico Scholz's avatarEnrico Scholz <enrico.scholz@sigma-chemnitz.de>
    97128b94
  • Enrico Scholz's avatar
    gitignore: updated · 1ad056d0
    Enrico Scholz authored
    Signed-off-by: Enrico Scholz's avatarEnrico Scholz <enrico.scholz@sigma-chemnitz.de>
    1ad056d0
  • Enrico Scholz's avatar
    CI: use sstate-server · ddaa637e
    Enrico Scholz authored
    ddaa637e
  • Enrico Scholz's avatar
    CI: allow downstream triggers · 72018625
    Enrico Scholz authored
    72018625
  • Enrico Scholz's avatar
    CI: use f31 · 7a5c2d25
    Enrico Scholz authored
    7a5c2d25
......@@ -3,7 +3,7 @@ include: https://gitlab-ext.sigma-chemnitz.de/elito/gitlab-ci/raw/master/yml/oe-
variables:
X_PROJECT: "vm016-mx8m"
X_CI_DISTRO_FEDORA_30: "t"
X_CI_DISTRO_FEDORA_31: "t"
## generic build script
.build:generic:
......@@ -16,6 +16,11 @@ variables:
https://gitlab.intern.sigma-chemnitz.de/elito-meta/de.sigma-chemnitz.git \
"${CI_COMMIT_REF_NAME}" "${X_CI_SIGMA_CORE_REF}"
submodule_override sources/de.sigma-chemnitz.vm016-mx8m \
https://gitlab.intern.sigma-chemnitz.de/phytec/vm016-mx8m/de.sigma-chemnitz.vm016-mx8m \
"${CI_COMMIT_REF_NAME}" "${X_CI_SIGMA_VM016_MX8M_REF}"
- make sstate-session || 'true'
- _bbinfo
- _make ci-build -k
......@@ -68,14 +73,14 @@ sdk:debian:sid:
#
build:fedora:30:
build:fedora:31:
extends:
- .distro:fedora:30
- .distro:fedora:31
- .build-image:oe
sdk:fedora:30:
sdk:fedora:31:
extends:
- .distro:fedora:30
- .distro:fedora:31
- .build-sdk:oe
## Assemble results
......@@ -83,8 +88,8 @@ assemble:fedora:
extends:
- .assemble:oe
dependencies:
- build:fedora:30
- sdk:fedora:30
- build:fedora:31
- sdk:fedora:31
script:
- M='phyboard-polaris-imx8m-2'
......
[submodule "sources/meta-openembedded"]
path = sources/meta-openembedded
url = git://github.com/openembedded/meta-openembedded
branch = warrior
branch = zeus
[submodule "sources/meta-phytec"]
path = sources/meta-phytec
url = ssh://git@git.phytec.de/meta-phytec-dev
branch = warrior
branch = master
[submodule "sources/meta-qt5"]
path = sources/meta-qt5
url = git://github.com/meta-qt5/meta-qt5
branch = warrior
branch = zeus
[submodule "sources/poky"]
path = sources/poky
url = git://git.yoctoproject.org/poky
branch = warrior
branch = zeus
[submodule "sources/de.sigma-chemnitz.core"]
path = sources/de.sigma-chemnitz.core
url = http://github.com/sigma-embedded/meta-de.sigma-chemnitz.git
branch = warrior
branch = zeus
[submodule "meta-yogurt-dev"]
path = sources/meta-yogurt
url = ssh://git@git.phytec.de/meta-yogurt-dev
branch = warrior
branch = master
[submodule "sources/de.sigma-chemnitz.vm016-mx8m"]
path = sources/de.sigma-chemnitz.vm016-mx8m
url = ../de.sigma-chemnitz.vm016-mx8m
......@@ -29,4 +29,4 @@
[submodule "sources/meta-freescale"]
path = sources/meta-freescale
url = https://github.com/Freescale/meta-freescale.git
branch = warrior
branch = zeus
......@@ -29,6 +29,7 @@ _bitbake = env ${EXTRA_ENV} ${BITBAKE} ${BITBAKE_FLAGS}
-include ${HOME}/.config/openembedded/toplevel.mk
-include $(HOME)/.config/openembedded/${PROJECT}.mk
# Usage: $(call init_build_env,<builddir>)
init_build_env = \
'.' $(top_srcdir)/sources/poky/oe-init-build-env \
$(abspath $1) $(top_srcdir)/sources/poky/bitbake
......@@ -65,12 +66,12 @@ _bitbake:
clean:
OE_TMPDIR ?= $(shell readlink -f "${top_srcdir}/build/tmp")
OE_TMPDIR ?= $(shell readlink -f "${BUILDDIR}/tmp")
mrproper: clean
rm -rf .emacs.d
readlink -f "${top_srcdir}/build/tmp"
readlink -f "${BUILDDIR}/tmp"
test -d "${OE_TMPDIR}"
rm -rf "${OE_TMPDIR}" "${top_srcdir}/build/cache"
rm -rf "${OE_TMPDIR}" "${BUILDDIR}/cache"
shell: export _PS1=${SHELL_PS1}
shell:
......@@ -95,6 +96,9 @@ ${_NOT_HOST_TARETS}: prohibit-host-environment
.PHONY: FORCE
FORCE:
###### optional SIGMA setup
-include ${META_SIGMA_DIR}/mk/sstate-server.mk
###### local setup
-include ${HOME}/.config/elito/phytec-${PROJECT}.mk
......@@ -104,6 +108,12 @@ ifneq ($(findstring k,$(MAKEFLAGS)),)
BITBAKE_FLAGS += -k
endif
ifeq (${VV},)
Q = @
else
Q =
endif
BITBAKE_FLAGS += ${BO}
###### internal overrides
......
/.log
/.sstate-server-session.mk
/bitbake-cookerdaemon.log
/bitbake.lock
/cache
/conf/sanity_info
/tmp
......@@ -18,13 +18,19 @@ BBLAYERS = " \
\
${BSPDIR}/sources/meta-openembedded/meta-oe \
${BSPDIR}/sources/meta-openembedded/meta-multimedia \
${BSPDIR}/sources/meta-openembedded/meta-python \
${BSPDIR}/sources/meta-freescale \
${BSPDIR}/sources/meta-phytec \
${BSPDIR}/sources/meta-qt5 \
"
LAYERSERIES_COMPAT_phytec_append = " zeus"
BBLAYERS += "${BSPDIR}/sources/de.sigma-chemnitz.core"
BBLAYERS += "${BSPDIR}/sources/de.sigma-chemnitz.vm016-mx8m"
BBMASK += "(meta-phytec/recipes-graphics/eglinfo/eglinfo-fb_%.bbappend)"
BBMASK += "(meta-phytec/recipes-bsp/u-boot/u-boot_2019.10.bbappend)"
HOSTNAME := "${@bb.process.run('hostname')[0].strip()}"
......
......@@ -7,7 +7,7 @@ BUILDHISTORY_DIR = "${TOPDIR}/.log/buildhistory"
TMPDIR = "${TMPDIR_ROOT}/bsp"
IMAGE_FEATURES[validitems] += "devel-sshkey"
INHERIT += "elito-emit-buildvars buildhistory-ext"
USER_CLASSES += "elito-emit-buildvars buildhistory-ext sstate-server"
WS_DIR = "${SOURCES_ROOT}/../workspace"
#BB_VERBOSE_LOGS = "1"
......
Subproject commit b22cd910fb84eaabf86f3903660820edfdc1ae08
Subproject commit 327f5818714a8aa5c26b3461d4bf07491bab1e06
Subproject commit 7c1c328bf3456117b3fbe150c5cfea618b456be9
Subproject commit 9af16dd70fc33efa11eb6680b041c039a83741ea
Subproject commit 2142f7ded1b3115ccc21f7575fd83e2376247193
Subproject commit 0be39721cea6e04c589a419f4bb07fabd0da6704
Subproject commit 3bdbf72e3a4bf18a4a2c7afbde4f7ab773aeded9
Subproject commit aad5b3d070cd8c58828b0975cf861d8ebc90f460
meta-phytec @ 54444397
Subproject commit 1690713a81907d5d116f8ddac93c0cd3adff0387
Subproject commit 544443978facd93fa21fc47b3e18d90503222a44
Subproject commit dc2dedef9961950b88f4245ba7499538ec4244ab
Subproject commit 432ad2aa6c3a13253fefc909faba368851d21fb1
meta-yogurt @ 1383df1b
Subproject commit dcd1df14fcc4637bb83bf3514aa186c228c4141d
Subproject commit 1383df1b7acefb96e59f58771be34ab7fcc778ad
poky @ 5d50b054
Subproject commit 6d2e12e79211b31cdf5ea824fb9a8be54ba9a9eb
Subproject commit 5d50b0549e5d91cb3072dada0e33a43dfb9e2071