Skip to content

Add support for full custom update handler #362

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.

Sign up for GitHub

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

Open
dennisvec wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for full custom update handler #362

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 29 additions & 10 deletions classes-recipe/bundle.bbclass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@
# RAUC_MANIFEST_EXTRA_LINES variable (using '\n' to indicate newlines):
#
# RAUC_MANIFEST_EXTRA_LINES = "[section]\nkey=value\n"
#
# To add a full custom update handler to your manifest file
# RAUC_FULL_CUSTOM_HANDLER[file] ?= "custom-handler.sh"
#

LICENSE ?= "MIT"

Expand Down Expand Up @@ -137,6 +141,7 @@ RAUC_BUNDLE_FORMAT[doc] = "Specifies the bundle format to be used (plain/verity)

RAUC_VARFLAGS_SLOTS = "name type fstype file hooks adaptive rename offset depends"
RAUC_VARFLAGS_HOOKS = "file hooks"
RAUC_FULL_CUSTOM_HANDLER[doc] = "Allows to specify a script to be include in the bundle that performs a full custom update."

# Create dependency list from images
python __anonymous() {
Expand Down Expand Up @@ -226,6 +231,13 @@ def write_manifest(d):
'\nIf you are unsure, set RAUC_BUNDLE_FORMAT = "verity" for new projects.'
'\nRefer to https://rauc.readthedocs.io/en/latest/reference.html#sec-ref-formats for more information about RAUC bundle formats.')

custom_update = d.getVarFlags('RAUC_FULL_CUSTOM_HANDLER') or {}
if custom_update.get('file'):
bb.note("writing manifest with custom update %s" % custom_update.get('file'))
manifest.write('[handler]\n')
manifest.write("filename=%s\n" % custom_update.get('file'))
manifest.write('\n')

hooks_varflags = d.getVar('RAUC_VARFLAGS_HOOKS').split()
hooksflags = d.getVarFlags('RAUC_BUNDLE_HOOKS', expand=hooks_varflags) or {}
have_hookfile = False
Expand Down Expand Up @@ -344,26 +356,33 @@ def try_searchpath(file, d):

return None

python do_configure() {
def add_file(d, filename, file_type):
import shutil
import os
import stat
if not os.path.exists(d.expand("${UNPACKDIR}/%s" % filename)):
bb.error("%s file '%s' does not exist in WORKDIR" % (file_type, hf))
return
dst = d.expand("${BUNDLE_DIR}/%s" % filename)
bb.note("adding %s file to bundle dir: '%s'" % (file_type, filename))
shutil.copy(d.expand("${UNPACKDIR}/%s" % filename), dst)
st = os.stat(dst)
os.chmod(dst, st.st_mode | stat.S_IEXEC)

python do_configure() {
import subprocess

write_manifest(d)

hooks_varflags = d.getVar('RAUC_VARFLAGS_HOOKS').split()
hooksflags = d.getVarFlags('RAUC_BUNDLE_HOOKS', expand=hooks_varflags) or {}
if 'file' in hooksflags:
hf = hooksflags.get('file')
if not os.path.exists(d.expand("${UNPACKDIR}/%s" % hf)):
bb.error("hook file '%s' does not exist in UNPACKDIR" % hf)
return
dsthook = d.expand("${BUNDLE_DIR}/%s" % hf)
bb.note("adding hook file to bundle dir: '%s'" % hf)
shutil.copy(d.expand("${UNPACKDIR}/%s" % hf), dsthook)
st = os.stat(dsthook)
os.chmod(dsthook, st.st_mode | stat.S_IEXEC)
add_file(d, hooksflags.get('file'), 'hook')

custom_update = d.getVarFlags('RAUC_FULL_CUSTOM_HANDLER')
if custom_update and 'file' in custom_update:
file = custom_update.get('file')
add_file(d, custom_update.get('file'), 'custom_update')

for file in (d.getVar('RAUC_BUNDLE_EXTRA_FILES') or "").split():
bundledir = d.getVar('BUNDLE_DIR')
Expand Down