summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2023-09-17 08:41:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-09-18 11:35:38 +0100
commitd4f2f8269cff0e4e9a98ad1ef9c0f7b8a909d563 (patch)
tree697e1e5a81c26e7e0d9fbe269253aa77476599a8
parent022deeb0effb92280cb86da962d8bd5e94d44947 (diff)
downloadpoky-d4f2f8269cff0e4e9a98ad1ef9c0f7b8a909d563.tar.gz
recipetool/devtool: Ensure server knows about changed files
Bitbake has changed to require notification when metadata changes in the middle of tinfoil sessions. Add the required function calls at the places metadata is changed. (From OE-Core rev: e5574163ab49a8f51b2b34fd37acfd1cad9b7595) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/devtool/standard.py1
-rw-r--r--scripts/lib/devtool/upgrade.py1
-rw-r--r--scripts/lib/recipetool/append.py3
-rw-r--r--scripts/lib/recipetool/create.py1
-rw-r--r--scripts/lib/recipetool/setvar.py1
5 files changed, 6 insertions, 1 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 88a6ecd421..d53fb81007 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -587,6 +587,7 @@ def _extract_source(srctree, keep_temp, devbranch, sync, config, basepath, works
587 preservestampfile = os.path.join(sstate_manifests, 'preserve-stamps') 587 preservestampfile = os.path.join(sstate_manifests, 'preserve-stamps')
588 with open(preservestampfile, 'w') as f: 588 with open(preservestampfile, 'w') as f:
589 f.write(d.getVar('STAMP')) 589 f.write(d.getVar('STAMP'))
590 tinfoil.modified_files()
590 try: 591 try:
591 if is_kernel_yocto: 592 if is_kernel_yocto:
592 # We need to generate the kernel config 593 # We need to generate the kernel config
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index e015a85982..487308912f 100644
--- a/scripts/lib/devtool/upgrade.py
+++ b/scripts/lib/devtool/upgrade.py
@@ -429,6 +429,7 @@ def _create_new_recipe(newpv, md5, sha256, srcrev, srcbranch, srcsubdir_old, src
429 newvalues["LIC_FILES_CHKSUM"] = newlicchksum 429 newvalues["LIC_FILES_CHKSUM"] = newlicchksum
430 _add_license_diff_to_recipe(fullpath, license_diff) 430 _add_license_diff_to_recipe(fullpath, license_diff)
431 431
432 tinfoil.modified_files()
432 try: 433 try:
433 rd = tinfoil.parse_recipe_file(fullpath, False) 434 rd = tinfoil.parse_recipe_file(fullpath, False)
434 except bb.tinfoil.TinfoilCommandFailed as e: 435 except bb.tinfoil.TinfoilCommandFailed as e:
diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py
index 88ed8c5f01..9dbb1cc4b5 100644
--- a/scripts/lib/recipetool/append.py
+++ b/scripts/lib/recipetool/append.py
@@ -300,6 +300,7 @@ def appendfile(args):
300 perms = '0755' 300 perms = '0755'
301 install = {args.newfile: (args.targetpath, perms)} 301 install = {args.newfile: (args.targetpath, perms)}
302 oe.recipeutils.bbappend_recipe(rd, args.destlayer, {args.newfile: sourcepath}, install, wildcardver=args.wildcard_version, machine=args.machine) 302 oe.recipeutils.bbappend_recipe(rd, args.destlayer, {args.newfile: sourcepath}, install, wildcardver=args.wildcard_version, machine=args.machine)
303 tinfoil.modified_files()
303 return 0 304 return 0
304 else: 305 else:
305 if alternative_pns: 306 if alternative_pns:
@@ -355,7 +356,7 @@ def appendsrc(args, files, rd, extralines=None):
355 copyfiles[newfile] = srcfile 356 copyfiles[newfile] = srcfile
356 357
357 oe.recipeutils.bbappend_recipe(rd, args.destlayer, copyfiles, None, wildcardver=args.wildcard_version, machine=args.machine, extralines=extralines) 358 oe.recipeutils.bbappend_recipe(rd, args.destlayer, copyfiles, None, wildcardver=args.wildcard_version, machine=args.machine, extralines=extralines)
358 359 tinfoil.modified_files()
359 360
360def appendsrcfiles(parser, args): 361def appendsrcfiles(parser, args):
361 recipedata = _parse_recipe(args.recipe, tinfoil) 362 recipedata = _parse_recipe(args.recipe, tinfoil)
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index f9dda3c2f9..143bc63e9d 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -901,6 +901,7 @@ def create_recipe(args):
901 f.write('%s\n' % line) 901 f.write('%s\n' % line)
902 lastline = line 902 lastline = line
903 log_info_cond('Recipe %s has been created; further editing may be required to make it fully functional' % outfile, args.devtool) 903 log_info_cond('Recipe %s has been created; further editing may be required to make it fully functional' % outfile, args.devtool)
904 tinfoil.modified_files()
904 905
905 if tempsrc: 906 if tempsrc:
906 if args.keep_temp: 907 if args.keep_temp:
diff --git a/scripts/lib/recipetool/setvar.py b/scripts/lib/recipetool/setvar.py
index f8e2ee75fb..b5ad335cae 100644
--- a/scripts/lib/recipetool/setvar.py
+++ b/scripts/lib/recipetool/setvar.py
@@ -49,6 +49,7 @@ def setvar(args):
49 for patch in patches: 49 for patch in patches:
50 for line in patch: 50 for line in patch:
51 sys.stdout.write(line) 51 sys.stdout.write(line)
52 tinfoil.modified_files()
52 return 0 53 return 0
53 54
54 55