Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update layers and fix mounting error in initramfs #620

Merged
merged 6 commits into from
Nov 24, 2021
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Use wayland distro feature for native builds
- Fix task-depends.dot for multiconfig targets
- Adjust recipes using meson to work with meson 0.60+
- Upgrade linux-raspberrypi to 5.10.78
- Upgrade linux-raspberrypi to 5.10.81
- Fix parselogs regular expressions for 5.10 kernel
- Add Pi Zero 2 Wifi 64bit yocto machine in meta-raspberrypi
- Upgrade php to 8.x
- Upgrade linux-staging-ti to 5.10.65
Expand All @@ -55,6 +56,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Upgrade and fix freerdp 2.3.0 -> 2.4.1
- Fix mozjs on centos7 build hosts
- Add Wi-Fi/BT drivers for CM4 and Pi 400 to Raspberrypi4 machine configs
- Upgrade mesa to 21.3.0
- Fix OEQA warnings for append operators combined with +=
- Improve rust support in meson based builds
- Assorted recipe upgrades
- New recipes
- ntpsec, mozjs-78, gtk4, python3-imgtool, fwupd, fwupd-efi
Expand Down
2 changes: 1 addition & 1 deletion sources/meta-openembedded
Submodule meta-openembedded updated 20 files
+2 −2 meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
+1 −1 meta-oe/recipes-support/poppler/poppler_21.11.0.bb
+1 −1 meta-python/recipes-devtools/python/python3-aiohue_3.0.1.bb
+2 −0 meta-python/recipes-devtools/python/python3-aiosignal_1.2.0.bb
+2 −0 meta-python/recipes-devtools/python/python3-cchardet_2.1.7.bb
+1 −1 meta-python/recipes-devtools/python/python3-cmd2_2.3.1.bb
+3 −0 meta-python/recipes-devtools/python/python3-frozenlist_1.2.0.bb
+1 −1 meta-python/recipes-devtools/python/python3-imageio_2.11.0.bb
+1 −1 meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.22.bb
+1 −1 meta-python/recipes-devtools/python/python3-simplejson_3.17.6.bb
+1 −1 meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb
+0 −279 meta-xfce/recipes-apps/mousepad/files/0001-Plugin-support-Properly-handle-plugin-settings.patch
+1 −3 meta-xfce/recipes-apps/mousepad/mousepad_0.5.7.bb
+1 −1 meta-xfce/recipes-apps/ristretto/ristretto_0.12.0.bb
+1 −1 meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.5.bb
+2 −2 ...-panel-plugins/sensors/xfce4-sensors-plugin/0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch
+1 −1 meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.2.bb
+1 −1 meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.6.2.bb
+0 −44 meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0002-Remove-GTK2-leftovers.patch
+2 −5 meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb
2 changes: 1 addition & 1 deletion sources/meta-qt5
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
CONFIG_USB=y
kraj marked this conversation as resolved.
Show resolved Hide resolved
CONFIG_USB_MUSB_HDRC=y
CONFIG_USB_MUSB_DSPS=y
CONFIG_USB_STORAGE=y
CONFIG_USB_MUSB_AM35X=y
CONFIG_AM335X_CONTROL_USB=y
CONFIG_AM335X_PHY_USB=y
CONFIG_USB_GADGET=y
CONFIG_NOP_USB_XCEIV=y
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"

SRC_URI += "file://wireguard.cfg"
SRC_URI += "file://wireguard.cfg \
file://updater.cfg \
"

KERNEL_CONFIG_FRAGMENTS += "${WORKDIR}/wireguard.cfg"
KERNEL_CONFIG_FRAGMENTS += "${WORKDIR}/wireguard.cfg \
${WORKDIR}/updater.cfg \
"
16 changes: 9 additions & 7 deletions sources/meta-yoe/recipes-support/updater/files/updater.installer
Original file line number Diff line number Diff line change
Expand Up @@ -214,14 +214,16 @@ format_emmc_data() {

mount_usb() {
mkdir -p $USB_MOUNT_POINT
if ! mount /dev/sda $USB_MOUNT_POINT; then
if ! mount /dev/sda1 $USB_MOUNT_POINT; then
msg_splash "No USB Installer disk detected"
return 1
for part in sda1 sda sdb1 sdb
do
test -e /dev/$part && mount /dev/$part $USB_MOUNT_POINT 2>/dev/null
if [ $? -eq 0 ]; then
msg_splash "Found Installer disk at /dev/$part"
return 0
fi
fi
msg_splash "USB disk mounted"
return 0
done
msg_splash "No USB Installer disk detected"
return 1
}

umount_usb() {
Expand Down