Skip to content

Commit

Permalink
Merge pull request #325 from MaxKellermann/update
Browse files Browse the repository at this point in the history
Update XCSoar, kernel, Yocto
  • Loading branch information
linuxianer99 authored Aug 21, 2022
2 parents c0abce7 + 631aae9 commit 68c73d0
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 195 deletions.
2 changes: 1 addition & 1 deletion bitbake
Submodule bitbake updated from c212b0 to b8fd6f
2 changes: 1 addition & 1 deletion meta-openembedded
Submodule meta-openembedded updated from bb2b5b to 8f2dc1
3 changes: 0 additions & 3 deletions meta-ov/recipes-apps/xcsoar/xcsoar.inc
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ LC_LOCALE_PATH = "${datadir}/locale"

SRC_URI += " \
file://0007-Disable-touch-screen-auto-detection.patch \
https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.bz2;sha256sum=8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc;unpack=0 \
https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.bz2;sha256sum=475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39;unpack=0 \
"

Expand All @@ -63,8 +62,6 @@ EXTRA_OEMAKE = " \

do_configure() {
install -d ${B}/output/download
# TODO: remove Boost 1.78.0 after XCSoar 7.24 has been released
cp ${WORKDIR}/boost_1_78_0.tar.bz2 ${B}/output/download/
cp ${WORKDIR}/boost_1_79_0.tar.bz2 ${B}/output/download/
oe_runmake boost
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ RCONFLICTS:${PN}="xcsoar-testing"
SRC_URI = "git://github.com/XCSoar/XCSoar.git;protocol=https;branch=master \
"

SRCREV = "6c33d2697576c6e408ddb9f553430050f91efb73"
SRCREV = "9799c8ff9dc4356964a199224745dca142ffb99c"

# TODO remove this after 7.25 has been released with https://github.com/XCSoar/XCSoar/commit/7ce3070fee3a140b6a4d9437a2cfe9854f78abfe
EXTRA_CXXFLAGS = "-Wno-empty-body"
export EXTRA_CXXFLAGS

require xcsoar.inc

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 2 additions & 0 deletions meta-ov/recipes-kernel/linux/files/debloat.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
# CONFIG_NET_VENDOR_ENGLEDER is not set
# CONFIG_NET_VENDOR_EZCHIP is not set
# CONFIG_NET_VENDOR_FARADAY is not set
# CONFIG_NET_VENDOR_FUNGIBLE is not set
# CONFIG_NET_VENDOR_GOOGLE is not set
# CONFIG_NET_VENDOR_HISILICON is not set
# CONFIG_NET_VENDOR_HUAWEI is not set
Expand Down Expand Up @@ -73,6 +74,7 @@
# CONFIG_WLAN_VENDOR_INTERSIL is not set
# CONFIG_WLAN_VENDOR_MARVELL is not set
# CONFIG_WLAN_VENDOR_MICROCHIP is not set
# CONFIG_WLAN_VENDOR_PURELIFI is not set
# CONFIG_WLAN_VENDOR_RSI is not set
# CONFIG_WLAN_VENDOR_ST is not set
# CONFIG_WLAN_VENDOR_TI is not set
Expand Down
1 change: 1 addition & 0 deletions meta-ov/recipes-kernel/linux/files/sunxi.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ CONFIG_SUN4I_EMAC=y
CONFIG_RTC_CLASS=y
# CONFIG_RTC_INTF_PROC is not set
# CONFIG_RTC_DRV_SUN6I is not set
# CONFIG_SUN6I_RTC_CCU is not set
CONFIG_RTC_DRV_SUNXI=y

CONFIG_DMADEVICES=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ inherit kernel kernel-yocto siteinfo

S = "${WORKDIR}/git"

KBRANCH = "linux-5.17.y"
KBRANCH = "linux-5.19.y"

SRCREV = "2731bd17017d4a0e2180a1917ab22d7820a07330"
SRCREV = "692b33c0449da9d801b0f3bebc1d5161be2f8b84"

SRC_URI = " \
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git;branch=${KBRANCH} \
Expand All @@ -36,9 +36,6 @@ SRC_URI = " \
"

SRC_URI:append:sunxi = " \
file://0001-pwm-sun4i-convert-next_period-to-local-variable.patch \
file://0002-pwm-sun4i-calculate-delay_jiffies-directly-eliminate.patch \
file://0003-pwm-sun4i-calculate-the-delay-without-rounding-down-.patch \
file://0004-1.1V-fix-for-sun7i-a20.dtsi.patch\
\
file://openvario-common.dts \
Expand Down
2 changes: 1 addition & 1 deletion openembedded-core
Submodule openembedded-core updated from ec9e94 to 2cafa6

0 comments on commit 68c73d0

Please sign in to comment.