Repository navigation
[Backport blacksail] Release update: master PRs #134-#147 - #153
Draft
lucianogdittgen wants to merge 23 commits into
Draft
lucianogdittgen wants to merge 23 commits into
lucianogdittgen wants to merge 23 commits into
Conversation
Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br> (cherry picked from commit 3207ecc)
conf/layer.conf now declares the layer compatible with blacksail only, so lint the recipes against that release's variables and rules instead of wrynose's. Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br> (cherry picked from commit a6e38b1)
The executor strips ';' anyway, but with it the functions drop out of the task signature (OE-Core warns since nanbield). Checked with bitbake -e: the function sequence is identical before and after. Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br> (cherry picked from commit bf7c578)
The executor strips ';' anyway, but with it the functions drop out of the task signature (OE-Core warns since nanbield). Checked with bitbake -e: the function sequence is identical before and after. Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br> (cherry picked from commit 27c2115)
The executor strips ';' anyway, but with it the functions drop out of the task signature (OE-Core warns since nanbield). Checked with bitbake -e: the function sequence is identical before and after. Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br> (cherry picked from commit 04752e2)
The executor strips ';' anyway, but with it the functions drop out of the task signature (OE-Core warns since nanbield). Checked with bitbake -e: the function sequence is identical before and after. Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br> (cherry picked from commit 8e5863c)
SRCPV is deprecated and expands to nothing; the fetcher adds the git revision to PKGV whenever PV contains "+git". Tested: bitbake -e easysplash gives the same PV, PKGV and PF before and after. Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br> (cherry picked from commit ded797f)
The ConfigParsed handler wrote a tag into SRCPV:pn-<recipe> for the per-recipe check to read back, abusing a deprecated variable. The check now reads OSSYSTEMS_USE_ONSITE_ONLY_RECIPES itself. Tested: with easysplash listed, it is skipped for "0" and unset, parsed normally for "1". Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br> (cherry picked from commit 958da17)
OE-Core made systemd the default INIT_MANAGER and dropped 'none', so oel-tiny gained 'systemd usrmerge' in DISTRO_FEATURES on a musl distro that runs tiny-init-system. Tested with bitbake -e: no systemd or usrmerge left, VIRTUAL-RUNTIME_* unchanged. Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br> (cherry picked from commit cf14035)
e0d29f2 removed the OEL_DEFAULT_EXTRA_RRECOMMENDS hook from oel.inc, so oel-tiny's override became dead and, without systemd, oel.inc now recommends nss-myhostname, which is not buildable with musl. Tested with bitbake -e: DISTRO_EXTRA_RRECOMMENDS is empty for oel-tiny and oel. Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br> (cherry picked from commit 6937c11)
DISTRO_FEATURES_USBGADGET and DISTRO_FEATURES_WIFI are only set in
comments, so DISTRO_FEATURES carried them as literal unexpanded
'${...}' strings. Tested with bitbake -e for oel-tiny.
Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br>
(cherry picked from commit fa3a216)
OE-Core now expects distros to choose an init manager; oel has relied on its systemd default since wrynose. The busybox login_manager preference always lost to init-manager-systemd and every other init manager already defaults to busybox, so drop it. Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br> (cherry picked from commit 38041ff)
It was hooked up as DEFAULTTUNE_oel, pre-honister override syntax, so since 2021 it only set an unused variable and never changed any tune. Tested with bitbake -e busybox and core-image-minimal (qemuarm): only DEFAULTTUNE_oel and the function itself disappear. Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br> (cherry picked from commit 43a9f86)
The append always added a space, so a build without a build number shipped VERSION="26.11-snapshot-<date> ". Put the space inside the conditional string. Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br> (cherry picked from commit bec260c)
1aa0efb moved cog-init with an extra cog/ level, so the recipe sat at recipes-browser/cog/cog/ and BBFILES_DYNAMIC (*/*/*.bb) never parsed it. Tested with a webkit stub layer: cog-init do_fetch, do_unpack and do_populate_lic succeed. Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br> (cherry picked from commit 99773ea)
BitBake warns about the missing whitespace on every parse with DISTRO=oel-tiny. Tested: bitbake -e output is identical apart from the two warnings, which are gone. Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br> (cherry picked from commit 64bb896)
Master moved past wrynose (26.05) toward blacksail, so the snapshot version named the previous cycle. Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br> (cherry picked from commit 4bcc850)
…name
INITSCRIPT_NAME was "${BPM}", an undefined variable, so update-rc.d
registered a script literally named "${BPM}" and the installed
/etc/init.d/chromium-ozone-wayland never started. Tested: package_qa
with DISTRO=oel-tiny + sysvinit; the postinst now runs update-rc.d on
chromium-ozone-wayland.
Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br>
(cherry picked from commit ee591f1)
…ript meta-browser installs the browser only as /usr/bin/chromium; there is no /usr/bin/chromium-ozone-wayland, so the "[ -x $DAEMON ] || exit 0" guard made the sysvinit script a silent no-op. The systemd unit already runs /usr/bin/chromium. NAME stays, as it names the pidfile and the /etc/default file. Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br> (cherry picked from commit 69d09ed)
The script was installed as /etc/init.d/kiosk while INITSCRIPT_NAME, the systemd unit and the /etc/default file all use qt-kiosk-browser, so update-rc.d linked a script that does not exist. Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br> (cherry picked from commit 793842f)
…onfig NAME was "qt-kiosk-browser-init", so the script looked for /usr/bin/qt-kiosk-browser-init and /etc/qt-kiosk-browser-init.conf; neither exists, and "test -x || exit 0" made it a silent no-op. It also never read /etc/default/qt-kiosk-browser, which carries WAYLAND_DISPLAY, XDG_RUNTIME_DIR and QTWEBENGINE_CHROMIUM_FLAGS for the systemd unit. Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br> (cherry picked from commit b4abb14)
OE-Core ships ppp 2.5.x, so the hard-coded plugin dir put the NM plugin where pppd never looks. meta-networking's PACKAGECONFIG[ppp] already takes the dir from pppd.pc. Tested: bitbake -e networkmanager with meta-networking master, default and with PACKAGECONFIG ppp. Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br> (cherry picked from commit 69ae464)
Upstream EasySplash has only a 1.0.0 tag, so the 2.0.0 recipes had no version to compare with. Tested with devtool check-upgrade-status: the three recipes went from UNKNOWN_BROKEN to new upstream commits. Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br> (cherry picked from commit e8c462a)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport to
blacksailof the release-update PRs merged on master. Each commit is a cleancherry-pick -x, in master merge order.blacksailwas created from master at c399a92 (before this series), so with this PR it matches master as of #147.