diff options
Diffstat (limited to 'meta-raspberrypi')
-rw-r--r-- | meta-raspberrypi/.github/actions/docker-build/action.yml | 2 | ||||
-rw-r--r-- | meta-raspberrypi/.github/workflows/yocto-builds.yml | 2 | ||||
-rw-r--r-- | meta-raspberrypi/.github/workflows/yocto-layer.yml | 2 | ||||
-rw-r--r-- | meta-raspberrypi/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.%.bbappend (renamed from meta-raspberrypi/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bbappend) | 0 | ||||
-rw-r--r-- | meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/libcamera/libcamera.bbappend | 2 | ||||
-rw-r--r-- | meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb | 4 | ||||
-rw-r--r-- | meta-raspberrypi/recipes-multimedia/libcamera-apps/rpi-libcamera-apps_git.bb | 44 |
7 files changed, 48 insertions, 8 deletions
diff --git a/meta-raspberrypi/.github/actions/docker-build/action.yml b/meta-raspberrypi/.github/actions/docker-build/action.yml index 35fac92c24..b91668e366 100644 --- a/meta-raspberrypi/.github/actions/docker-build/action.yml +++ b/meta-raspberrypi/.github/actions/docker-build/action.yml @@ -17,7 +17,7 @@ runs: steps: - name: Build the ${{ inputs.docker_image }} docker image shell: bash - # We run this unconditinally even if the change doesn't touch the + # We run this unconditionally even if the change doesn't touch the # relevant docker files because there is a chance that another PR (or # something else) rebuilt the local image. For example if the first # version of the PR included change for the relevant docker image but a diff --git a/meta-raspberrypi/.github/workflows/yocto-builds.yml b/meta-raspberrypi/.github/workflows/yocto-builds.yml index 3f21242e59..d237f0ab39 100644 --- a/meta-raspberrypi/.github/workflows/yocto-builds.yml +++ b/meta-raspberrypi/.github/workflows/yocto-builds.yml @@ -50,7 +50,7 @@ jobs: .github/workflows/docker-images/yocto-builder/** .github/workflows/docker-images/*.sh .github/workflows/yocto-builds.yml - classes/**' + classes/** conf/** dynamic-layers/** files/** diff --git a/meta-raspberrypi/.github/workflows/yocto-layer.yml b/meta-raspberrypi/.github/workflows/yocto-layer.yml index 6d923665c0..63cb9e90a6 100644 --- a/meta-raspberrypi/.github/workflows/yocto-layer.yml +++ b/meta-raspberrypi/.github/workflows/yocto-layer.yml @@ -27,7 +27,7 @@ jobs: .github/workflows/docker-images/yocto-builder/** .github/workflows/docker-images/*.sh .github/workflows/yocto-builds.yml - classes/**' + classes/** conf/** dynamic-layers/** files/** diff --git a/meta-raspberrypi/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bbappend b/meta-raspberrypi/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.%.bbappend index 22f8ce4107..22f8ce4107 100644 --- a/meta-raspberrypi/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bbappend +++ b/meta-raspberrypi/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.%.bbappend diff --git a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/libcamera/libcamera.bbappend b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/libcamera/libcamera.bbappend index 2721cfe778..efa1f80341 100644 --- a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/libcamera/libcamera.bbappend +++ b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/libcamera/libcamera.bbappend @@ -1,2 +1,2 @@ -PACKAGECONFIG[raspberrypi] = "-Dpipelines=raspberrypi" +PACKAGECONFIG[raspberrypi] = "-Dpipelines=raspberrypi -Dipas=raspberrypi -Dcpp_args=-Wno-unaligned-access" PACKAGECONFIG:append:rpi = " raspberrypi" diff --git a/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb b/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb index 6fb3a1bcc3..3ff82517ef 100644 --- a/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb +++ b/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb @@ -13,10 +13,6 @@ CMDLINE_ROOTFS ?= "root=/dev/mmcblk0p2 ${CMDLINE_ROOT_FSTYPE} rootwait" CMDLINE_SERIAL ?= "${@oe.utils.conditional("ENABLE_UART", "1", "console=serial0,115200", "", d)}" -CMDLINE_CMA ?= "${@oe.utils.conditional("RASPBERRYPI_CAMERA_V2", "1", "cma=64M", "", d)}" - -CMDLINE_CMA ?= "${@oe.utils.conditional("RASPBERRYPI_HD_CAMERA", "1", "cma=64M", "", d)}" - CMDLINE_PITFT ?= "${@bb.utils.contains("MACHINE_FEATURES", "pitft", "fbcon=map:10 fbcon=font:VGA8x8", "", d)}" # Add the kernel debugger over console kernel command line option if enabled diff --git a/meta-raspberrypi/recipes-multimedia/libcamera-apps/rpi-libcamera-apps_git.bb b/meta-raspberrypi/recipes-multimedia/libcamera-apps/rpi-libcamera-apps_git.bb new file mode 100644 index 0000000000..073105dffd --- /dev/null +++ b/meta-raspberrypi/recipes-multimedia/libcamera-apps/rpi-libcamera-apps_git.bb @@ -0,0 +1,44 @@ +SUMMARY = "A suite of libcamera-based apps for the Raspberry Pi" +DESCRIPTION = "This is a small suite of libcamera-based apps that aim to \ +copy the functionality of the existing \"raspicam\" apps." +HOMEPAGE = "https://github.com/raspberrypi/libcamera-apps" +SECTION = "console/utils" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://license.txt;md5=a0013d1b383d72ba4bdc5b750e7d1d77" + +SRC_URI = "\ + git://github.com/raspberrypi/libcamera-apps.git;protocol=https;branch=main \ +" +SRCREV = "22a52590c33a813743b4e6337478c208201c77b1" + +S = "${WORKDIR}/git" + +COMPATIBLE_MACHINE = "^rpi$" + +DEPENDS = "libcamera libexif jpeg tiff libpng boost" + +inherit cmake pkgconfig + +EXTRA_OECMAKE = "\ + -DCMAKE_BUILD_TYPE=Release \ + -DBoost_INCLUDE_DIR=${STAGING_INCDIR} \ + -DCMAKE_LIBRARY_PATH=${STAGING_LIBDIR} \ +" + +EXTRA_OECMAKE:append:raspberrypi3 = " -DENABLE_COMPILE_FLAGS_FOR_TARGET=armv8-neon" +EXTRA_OECMAKE:append:raspberrypi4 = " -DENABLE_COMPILE_FLAGS_FOR_TARGET=armv8-neon" + +PACKAGECONFIG[x11] = "-DENABLE_X11=1,-DENABLE_X11=0" +PACKAGECONFIG[qt] = "-DENABLE_QT=1,-DENABLE_QT=0" +PACKAGECONFIG[opencv] = "-DENABLE_OPENCV=1,-DENABLE_OPENCV=0" +PACKAGECONFIG[tensorflow-lite] = "-DENABLE_TFLITE=1,-DENABLE_TFLITE=0" + +# Build does not version solibs so we need to change the suffix +SOLIBS = ".so" +FILES_SOLIBSDEV = "" + +do_install:append() { + # Requires python3-core which not all systems may have + rm ${D}/${bindir}/camera-bug-report +} |