dany/meta-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/meta-sunxi.git synced 2024-12-26 13:08:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #334 from clementperon/to_merge

Browse Source 
Fixes
This commit is contained in:
Marek Belisko 2022-01-03 18:02:21 +01:00 committed by GitHub
commit c39a024199
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/sdcard_image-sunxi.bbclass
View File

@ -30,7 +30,7 @@ IMAGE_ROOTFS_ALIGNMENT = "2048"
SDIMG_ROOTFS = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}" SDIMG_ROOTFS = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}"
do_image:sunxi_sdimg[depends] += " \ do_image_sunxi_sdimg[depends] += " \
parted-native:do_populate_sysroot \ parted-native:do_populate_sysroot \
mtools-native:do_populate_sysroot \ mtools-native:do_populate_sysroot \
dosfstools-native:do_populate_sysroot \ dosfstools-native:do_populate_sysroot \

2
conf/layer.conf
View File

@ -12,6 +12,6 @@ BBFILE_PRIORITY_meta-sunxi = "10"
# cause compatibility issues with other layers # cause compatibility issues with other layers
LAYERVERSION_meta-sunxi = "1" LAYERVERSION_meta-sunxi = "1"
LAYERDEPENDS_meta-sunxi = "core openembedded-layer" LAYERDEPENDS_meta-sunxi = "core"
LAYERSERIES_COMPAT_meta-sunxi = "honister" LAYERSERIES_COMPAT_meta-sunxi = "honister"

2
conf/machine/include/sunxi.inc
View File

@ -15,7 +15,7 @@ XSERVER = "xserver-xorg \
xf86-input-keyboard" xf86-input-keyboard"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline" PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
PREFERRED_VERSION_linux-mainline ?= "5.4.%" PREFERRED_VERSION_linux-mainline ?= "5.10.%"
PREFERRED_PROVIDER_u-boot ?= "u-boot" PREFERRED_PROVIDER_u-boot ?= "u-boot"
PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"

2
recipes-bsp/atf/atf-sunxi_git.bb
View File

@ -10,7 +10,7 @@ B = "${WORKDIR}/build"
COMPATIBLE_MACHINE = "(sun50i)" COMPATIBLE_MACHINE = "(sun50i)"
PLATFORM_sun50i = "sun50iw1p1" PLATFORM:sun50i = "sun50iw1p1"
LDFLAGS[unexport] = "1" LDFLAGS[unexport] = "1"

2
recipes-bsp/u-boot/u-boot-sunxi.bb
View File

@ -19,7 +19,7 @@ UBOOT_MACHINE_olinuxino-a10s = "A10s-OLinuXino-Micro_config"
UBOOT_MACHINE_meleg = "Mele_A1000G_config" UBOOT_MACHINE_meleg = "Mele_A1000G_config"
SRC_URI = " \ SRC_URI = " \
git://github.com/linux-sunxi/u-boot-sunxi.git;protocol=git;branch=sunxi \ git://github.com/linux-sunxi/u-boot-sunxi.git;protocol=https;branch=sunxi \
file://0001-gcc5-fixes.patch \ file://0001-gcc5-fixes.patch \
file://0002-gcc6-fixes.patch \ file://0002-gcc6-fixes.patch \
file://0003-No-gcc-version-specific-includes.patch \ file://0003-No-gcc-version-specific-includes.patch \

2
recipes-graphics/libump/libump_git.bb
View File

@ -8,7 +8,7 @@ inherit autotools
PV = "r4p0-00rel0+git${SRCPV}" PV = "r4p0-00rel0+git${SRCPV}"
SRCREV = "ec0680628744f30b8fac35e41a7bd8e23e59c39f" SRCREV = "ec0680628744f30b8fac35e41a7bd8e23e59c39f"
SRC_URI = "git://github.com/linux-sunxi/libump.git" SRC_URI = "git://github.com/linux-sunxi/libump.git;protocol=https;branch=master"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"

2
recipes-multimedia/gstreamer/gst-plugin-cedar_git.bb
View File

@ -10,7 +10,7 @@ inherit autotools pkgconfig
# 0.10.1 Initial Import # 0.10.1 Initial Import
SRCREV = "908987a74d341be1376895023698667892fe5569" SRCREV = "908987a74d341be1376895023698667892fe5569"
SRC_URI = "git://github.com/ebutera/gst-plugin-cedar.git" SRC_URI = "git://github.com/ebutera/gst-plugin-cedar.git;protocol=https;branch=master"
PV = "0.10.1+git${SRCPV}" PV = "0.10.1+git${SRCPV}"
PR = "r1" PR = "r1"

2
recipes-support/sunxi-tools/sunxi-tools_git.bb
View File

@ -7,7 +7,7 @@ PR = "r0"
DEPENDS += "libusb" DEPENDS += "libusb"
SRC_URI = "git://github.com/linux-sunxi/sunxi-tools;protocol=git" SRC_URI = "git://github.com/linux-sunxi/sunxi-tools;protocol=https;branch=master"
SRCREV = "9a3d62aa0c820b3dd42ba3409b2043f4143683cd" SRCREV = "9a3d62aa0c820b3dd42ba3409b2043f4143683cd"
inherit pkgconfig inherit pkgconfig