Hi Thomas, Check this link https://patchwork.openembedded.org/patch/133740/
I don't know what happened, but my patch is fine and your answer has line breaks. Anyway, check patchwork link. On Thu, Nov 10, 2016 at 8:03 AM, Thomas Thorne <thomas.tho...@net2edge.com> wrote: > I am almost certain this line change breaks the Python code: > > --- a/scripts/bitbake-metadata2doc.py > +++ b/scripts/bitbake-metadata2doc.py > @@ -112,8 +112,8 @@ def write_fsl_community_bsp_supported_kernels(data, > out_dir): > kernel = board_data['recipes']['virtual/kernel'] > recipe = kernel['recipe'] > recipe_file = kernel['file'] > - if (('/sources/meta-fsl-arm/' in recipe_file) or \ > - ('/sources/meta-fsl-arm-extra/' in recipe_file)) and \ > + if (('/sources/meta-freescale/' in recipe_file) or \ > + ('/sources/meta-freescale-3rdparty/' in recipe_file)) > + and \ > > That looks like \ are used for line continuation but an extra new line is > being added before the "and \" > > > I am more confident about the .sh files: > $machines; do > cd $yocto_dir > echo "Using $build_dir as build directory" > - MACHINE=$machine . ./setup-environment `basename $build_dir` > + MACHINE=$machine DISTRO=fslc-framebuffer . ./setup-environment > + `basename $build_dir` > > - MACHINE=$machine python3 $anchor/extract-bitbake-metadata.py \ > + MACHINE=$machine DISTRO=fslc-framebuffer python3 > + $anchor/extract-bitbake-metadata.py \ > $anchor/$marshalled_data_file \ > apptrk \ > barebox \ > > That will behave differently. > > Thomas A. F. Thorne Software Engineer Net2Edge > > -----Original Message----- > From: meta-freescale-boun...@yoctoproject.org [mailto:meta-freescale- > boun...@yoctoproject.org] On Behalf Of Fabio Berton > Sent: 09 November 2016 17:30 > To: meta-freescale@yoctoproject.org > Subject: [meta-freescale] [Documentation][PATCH 1/5] scripts: Update to > version 2.2 (Morty) > > - Update FSL layers names > - Add DISTRO and MACHINE to run setup-environment > - Update Yocto Project Bugzilla url address > > Signed-off-by: Fabio Berton <fabio.ber...@ossystems.com.br> > --- > scripts/bitbake-metadata2doc.py | 18 +++++++++--------- > scripts/bitbake-metadata2doc.sh | 6 +++--- > scripts/generate-bugs-table.py | 6 +++--- > scripts/output-machine-list | 2 +- > scripts/test-sheet-parser.py | 2 +- > 5 files changed, 17 insertions(+), 17 deletions(-) > > diff --git a/scripts/bitbake-metadata2doc.py b/scripts/bitbake-metadata2doc.py > index 98af3f8..001d59d 100644 > --- a/scripts/bitbake-metadata2doc.py > +++ b/scripts/bitbake-metadata2doc.py > @@ -112,8 +112,8 @@ def write_fsl_community_bsp_supported_kernels(data, > out_dir): > kernel = board_data['recipes']['virtual/kernel'] > recipe = kernel['recipe'] > recipe_file = kernel['file'] > - if (('/sources/meta-fsl-arm/' in recipe_file) or \ > - ('/sources/meta-fsl-arm-extra/' in recipe_file)) and \ > + if (('/sources/meta-freescale/' in recipe_file) or \ > + ('/sources/meta-freescale-3rdparty/' in recipe_file)) > + and \ > recipe not in kernel_recipes: > kernels += [[recipe, kernel['description']]] > kernel_recipes.append(recipe) @@ -128,8 +128,8 @@ def > write_fsl_community_bsp_supported_bootloaders_descr(data, out_dir): > bootloader = board_data['recipes'][bootloader_software] > recipe = bootloader['recipe'] > recipe_file = bootloader['file'] > - if (('/sources/meta-fsl-arm/' in recipe_file) or \ > - ('/sources/meta-fsl-arm-extra/' in recipe_file)) > and \ > + if (('/sources/meta-freescale/' in recipe_file) or \ > + ('/sources/meta-freescale-3rdparty/' in > + recipe_file)) and \ > recipe not in bootloader_recipes: > bootloaders += [[recipe, bootloader['description']]] > bootloader_recipes.append(recipe) @@ -305,14 +305,14 > @@ def write_soc_pkg(data, out_dir): > > > def write_maintainers_tables(data, out_dir, bsp_dir): > - meta_fsl_arm_machines_dir = os.path.join(bsp_dir, 'sources', > 'meta-fsl-arm', 'conf', 'machine') > - meta_fsl_arm_extra_machines_dir = os.path.join(bsp_dir, 'sources', > 'meta-fsl-arm-extra', 'conf', 'machine') > - get_maintainer_script = os.path.join(bsp_dir, 'sources', > 'meta-fsl-arm', 'scripts', 'get-maintainer') > + meta_freescale_machines_dir = os.path.join(bsp_dir, 'sources', > 'meta-freescale', 'conf', 'machine') > + meta_freescale_3rdparty_machines_dir = os.path.join(bsp_dir, > 'sources', 'meta-freescale-3rdparty', 'conf', 'machine') > + get_maintainer_script = os.path.join(bsp_dir, 'sources', > + 'meta-freescale', 'scripts', 'get-maintainer') > try: > get_maintainer_pipe = subprocess.Popen([get_maintainer_script, > '--dump', > - meta_fsl_arm_machines_dir, > - > meta_fsl_arm_extra_machines_dir], > + > meta_freescale_machines_dir, > + > + meta_freescale_3rdparty_machines_dir], > stdout=subprocess.PIPE) > except OSError: > error('Could not run the get-maintainer script (attempted %s)' % > (get_maintainer_script,)) diff --git a/scripts/bitbake-metadata2doc.sh > b/scripts/bitbake-metadata2doc.sh index 3616fe1..775e26d 100755 > --- a/scripts/bitbake-metadata2doc.sh > +++ b/scripts/bitbake-metadata2doc.sh > @@ -46,7 +46,7 @@ gitdm_dir="$2" > start_commit="$3" > end_commit="$4" > anchor="`pwd`" > -fsl_layers="meta-fsl-arm meta-fsl-arm-extra meta-fsl-demos" > +fsl_layers="meta-freescale meta-freescale-3rdparty meta-freescale-distro" > > machines= > if [ -n "$MACHINES" ]; then > @@ -80,9 +80,9 @@ build_dir=`mktemp -d --tmpdir=$yocto_dir` for machine > in $machines; do > cd $yocto_dir > echo "Using $build_dir as build directory" > - MACHINE=$machine . ./setup-environment `basename $build_dir` > + MACHINE=$machine DISTRO=fslc-framebuffer . ./setup-environment > + `basename $build_dir` > > - MACHINE=$machine python3 $anchor/extract-bitbake-metadata.py \ > + MACHINE=$machine DISTRO=fslc-framebuffer python3 > + $anchor/extract-bitbake-metadata.py \ > $anchor/$marshalled_data_file \ > apptrk \ > barebox \ > diff --git a/scripts/generate-bugs-table.py b/scripts/generate-bugs-table.py > index 13390a3..dc9bba0 100755 > --- a/scripts/generate-bugs-table.py > +++ b/scripts/generate-bugs-table.py > @@ -13,10 +13,10 @@ from doc_utils import tabularize > > BASE_DIRECTORY = os.path.dirname(os.path.realpath(__file__ + "/../")) > > -CLOSED_BUGS_URL = "https://bugzilla.yoctoproject.org/buglist.cgi? > v4=meta-fsl-arm&o5=substring&f1=OP&o3=substring&v6=meta- > fsl-arm&o7=matches&f0=OP&f8=CP&v3=meta-fsl-arm&o2= > substring&o6=substring&v7=%22meta-fsl-arm%22&f9=CP&f4= > alias&chfieldto=Now&v5=meta-fsl-arm&chfield=bug_status& > query_format=advanced&j1=OR&f3=component&chfieldfrom=<< > START_DATE>>&f2=product&o4=substring&bug_status=RESOLVED& > bug_status=VERIFIED&bug_status=CLOSED&f5=short_desc& > f6=status_whiteboard&v2=meta-fsl-arm&f7=content&ctype=csv" > +CLOSED_BUGS_URL = "https://bugzilla.yoctoproject.org/buglist.cgi? > v4=meta-freescale&o5=substring&f1=OP&o3=substring& > v6=meta-freescale&o7=matches&f0=OP&f8=CP&v3=meta-freescale& > o2=substring&o6=substring&v7=%22meta-freescale%22&f9=CP&f4= > alias&chfieldto=Now&v5=meta-freescale&chfield=bug_status& > query_format=advanced&j1=OR&f3=component&chfieldfrom=<< > START_DATE>>&f2=product&o4=substring&bug_status=RESOLVED& > bug_status=VERIFIED&bug_status=CLOSED&f5=short_desc& > f6=status_whiteboard&v2=meta-freescale&f7=content&ctype=csv" > CLOSED_BUGS_OUTPUT_FILE_PATH = BASE_DIRECTORY + > "/release-notes/source/closed_bugs.inc" > > -OPEN_BUGS_URL = "https://bugzilla.yoctoproject.org/buglist.cgi? > quicksearch=meta-fsl-arm&chfieldfrom=<<START_DATE>>&ctype=csv" > +OPEN_BUGS_URL = "https://bugzilla.yoctoproject.org/buglist.cgi? > quicksearch=meta-freescale&chfieldfrom=<<START_DATE>>&ctype=csv" > OPEN_BUGS_OUTPUT_FILE_PATH = BASE_DIRECTORY + "/release-notes/source/open_ > bugs.inc" > > def request_bug_list(url): > @@ -62,7 +62,7 @@ def generate_bugs_file(url, output_file_path, > columns_to_keep): > write_to_file(output_file_path, table) > > def process_arguments(): > - desc = ('Generates a ReST table of the meta-fsl-arm bugs present on > the ' + > + desc = ('Generates a ReST table of the meta-freescale bugs present > + on the ' + > 'Bugzilla bug list of the Yocto Project.') > parser = argparse.ArgumentParser(description=desc) > group = parser.add_mutually_exclusive_group() > diff --git a/scripts/output-machine-list b/scripts/output-machine-list > index 0f3e5de..c3ffb2c 100755 > --- a/scripts/output-machine-list > +++ b/scripts/output-machine-list > @@ -36,7 +36,7 @@ REPO=$1 > COMMAND=$2 > > TMP=`mktemp` > -MACHINE_LAYERS="meta-fsl-arm meta-fsl-arm-extra" > +MACHINE_LAYERS="meta-freescale meta-freescale-3rdparty" > > list_machine_files() { > for l in $MACHINE_LAYERS; do > diff --git a/scripts/test-sheet-parser.py b/scripts/test-sheet-parser.py > index 967f476..ecf6ea0 100755 > --- a/scripts/test-sheet-parser.py > +++ b/scripts/test-sheet-parser.py > @@ -11,7 +11,7 @@ def usage(exit_code=None): > <csv file> is the CSV file with the for responses. > > <fsl repos dir> is the directory under which the Freescale -repositories > (meta-fsl-arm and meta-fsl-arm-extra) can be found. > +repositories (meta-freescale and meta-freescale-3rdparty) can be found. > ''' % os.path.basename(sys.argv[0]) > if exit_code is not None and exit_code != 0: > sys.stderr.write(msg) > -- > 2.1.4 > > -- > _______________________________________________ > meta-freescale mailing list > meta-freescale@yoctoproject.org > https://lists.yoctoproject.org/listinfo/meta-freescale >
-- _______________________________________________ meta-freescale mailing list meta-freescale@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-freescale