Re: [oe] [meta-java][PATCH 2/2] openjdk-8: combine the -dbg package
On 2018年06月12日 19:09, Richard Leitner wrote: On 06/12/2018 12:59 PM, Wenlin Kang wrote: On 2018年06月12日 16:01, Richard Leitner wrote: Hi Richard Hi Wenlin, as we clarified the "one -dbg package per recipe" thing I have some comments on the patch itself. On 06/07/2018 11:24 AM, Wenlin Kang wrote: One recipe should only have one -dbg package, because OE only picks up all .debug file into the last one -dbg package listed in variable PACKAGES. May you please include a reference to that statement from "Ross Burton"? What about changing the comments as below: openjdk-8: remove redunant FILES_${PN}-dbg One recipe should only have one -dbg package, because OE only picks up all .debug file into the last one -dbg package listed in variable PACKAGES. Comments(oe-core's commit a3b000643898d7402b9e57c02e8d10e677cc9722) from Ross Burton as below: "meta: more removals of redunant FILES_${PN}-dbg In some recipes overly-split -dbg packages were merged into PN-dbg. Unless there's a very good reason, recipes should have a single -dev and -dbg package. " That's fine with me. Signed-off-by: Wenlin Kang --- recipes-core/openjdk/openjdk-8_16xbyy.bb | 10 +++--- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/recipes-core/openjdk/openjdk-8_16xbyy.bb b/recipes-core/openjdk/openjdk-8_16xbyy.bb index dd0ed1d..1d7d794 100644 --- a/recipes-core/openjdk/openjdk-8_16xbyy.bb +++ b/recipes-core/openjdk/openjdk-8_16xbyy.bb @@ -14,7 +14,6 @@ do_install() { } PACKAGES_append = " \ - ${PN}-demo-dbg \ ${PN}-demo \ ${PN}-source \ " @@ -47,12 +46,6 @@ FILES_${PN}-dbg_append = "\ ${JDK_HOME}/jre/lib/${JDK_ARCH}/headless/.debug/ \ ${JDK_HOME}/jre/lib/${JDK_ARCH}/xawt/.debug/ \ ${JDK_HOME}/jre/lib/${JDK_ARCH}/client/.debug/ \ -" - -FILES_${PN}-demo = " ${JDK_HOME}/demo ${JDK_HOME}/sample " -RDEPENDS_${PN}-demo = " ${PN} " - -FILES_${PN}-demo-dbg = "\ ${JDK_HOME}/demo/jvmti/gctest/lib/.debug/ \ ${JDK_HOME}/demo/jvmti/heapTracker/lib/.debug/ \ ${JDK_HOME}/demo/jvmti/heapViewer/lib/.debug/ \ @@ -64,6 +57,9 @@ FILES_${PN}-demo-dbg = "\ ${JDK_HOME}/demo/jvmti/compiledMethodLoad/lib/.debug/ \ " AFAIK as all ".debug" are included in the -dbg packages it should be fine if you remove the whole FILES_${PN}-dbg_append definition. I have tested it, that's OK after remove the whole FILES_${PN}-dbg_append definition. Do you mean that we should also remove FILES_${PN}-dbg_append? As there is AFAIK no reason to keep it... Yes please! Thanks, later I will send the new patch. thanks®ards;Richard.L -- Thanks, Wenlin Kang -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 2/2] openjdk-8: combine the -dbg package
On 06/12/2018 12:59 PM, Wenlin Kang wrote: > On 2018年06月12日 16:01, Richard Leitner wrote: > > Hi Richard > >> Hi Wenlin, >> as we clarified the "one -dbg package per recipe" thing I have some >> comments on the patch itself. >> >> >> On 06/07/2018 11:24 AM, Wenlin Kang wrote: >>> One recipe should only have one -dbg package, because OE only picks >>> up all .debug file into the last one -dbg package listed in variable >>> PACKAGES. >> May you please include a reference to that statement from "Ross Burton"? > > What about changing the comments as below: > > openjdk-8: remove redunant FILES_${PN}-dbg > > One recipe should only have one -dbg package, because OE only picks > up all .debug file into the last one -dbg package listed in variable > PACKAGES. > > Comments(oe-core's commit a3b000643898d7402b9e57c02e8d10e677cc9722) from > Ross Burton as below: > "meta: more removals of redunant FILES_${PN}-dbg > > In some recipes overly-split -dbg packages were merged into PN-dbg. Unless > there's a very good reason, recipes should have a single -dev and -dbg > package. > " That's fine with me. > >> >>> Signed-off-by: Wenlin Kang >>> --- >>> recipes-core/openjdk/openjdk-8_16xbyy.bb | 10 +++--- >>> 1 file changed, 3 insertions(+), 7 deletions(-) >>> >>> diff --git a/recipes-core/openjdk/openjdk-8_16xbyy.bb >>> b/recipes-core/openjdk/openjdk-8_16xbyy.bb >>> index dd0ed1d..1d7d794 100644 >>> --- a/recipes-core/openjdk/openjdk-8_16xbyy.bb >>> +++ b/recipes-core/openjdk/openjdk-8_16xbyy.bb >>> @@ -14,7 +14,6 @@ do_install() { >>> } >>> PACKAGES_append = " \ >>> - ${PN}-demo-dbg \ >>> ${PN}-demo \ >>> ${PN}-source \ >>> " >>> @@ -47,12 +46,6 @@ FILES_${PN}-dbg_append = "\ >>> ${JDK_HOME}/jre/lib/${JDK_ARCH}/headless/.debug/ \ >>> ${JDK_HOME}/jre/lib/${JDK_ARCH}/xawt/.debug/ \ >>> ${JDK_HOME}/jre/lib/${JDK_ARCH}/client/.debug/ \ >>> -" >>> - >>> -FILES_${PN}-demo = " ${JDK_HOME}/demo ${JDK_HOME}/sample " >>> -RDEPENDS_${PN}-demo = " ${PN} " >>> - >>> -FILES_${PN}-demo-dbg = "\ >>> ${JDK_HOME}/demo/jvmti/gctest/lib/.debug/ \ >>> ${JDK_HOME}/demo/jvmti/heapTracker/lib/.debug/ \ >>> ${JDK_HOME}/demo/jvmti/heapViewer/lib/.debug/ \ >>> @@ -64,6 +57,9 @@ FILES_${PN}-demo-dbg = "\ >>> ${JDK_HOME}/demo/jvmti/compiledMethodLoad/lib/.debug/ \ >>> " >> AFAIK as all ".debug" are included in the -dbg packages it should >> be fine if you remove the whole FILES_${PN}-dbg_append definition. > > I have tested it, that's OK after remove the whole FILES_${PN}-dbg_append > definition. > > Do you mean that we should also remove FILES_${PN}-dbg_append? As there is AFAIK no reason to keep it... Yes please! thanks®ards;Richard.L -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 2/2] openjdk-8: combine the -dbg package
On 2018年06月12日 16:01, Richard Leitner wrote: Hi Richard Hi Wenlin, as we clarified the "one -dbg package per recipe" thing I have some comments on the patch itself. On 06/07/2018 11:24 AM, Wenlin Kang wrote: One recipe should only have one -dbg package, because OE only picks up all .debug file into the last one -dbg package listed in variable PACKAGES. May you please include a reference to that statement from "Ross Burton"? What about changing the comments as below: openjdk-8: remove redunant FILES_${PN}-dbg One recipe should only have one -dbg package, because OE only picks up all .debug file into the last one -dbg package listed in variable PACKAGES. Comments(oe-core's commit a3b000643898d7402b9e57c02e8d10e677cc9722) from Ross Burton as below: "meta: more removals of redunant FILES_${PN}-dbg In some recipes overly-split -dbg packages were merged into PN-dbg. Unless there's a very good reason, recipes should have a single -dev and -dbg package. " Signed-off-by: Wenlin Kang --- recipes-core/openjdk/openjdk-8_16xbyy.bb | 10 +++--- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/recipes-core/openjdk/openjdk-8_16xbyy.bb b/recipes-core/openjdk/openjdk-8_16xbyy.bb index dd0ed1d..1d7d794 100644 --- a/recipes-core/openjdk/openjdk-8_16xbyy.bb +++ b/recipes-core/openjdk/openjdk-8_16xbyy.bb @@ -14,7 +14,6 @@ do_install() { } PACKAGES_append = " \ -${PN}-demo-dbg \ ${PN}-demo \ ${PN}-source \ " @@ -47,12 +46,6 @@ FILES_${PN}-dbg_append = "\ ${JDK_HOME}/jre/lib/${JDK_ARCH}/headless/.debug/ \ ${JDK_HOME}/jre/lib/${JDK_ARCH}/xawt/.debug/ \ ${JDK_HOME}/jre/lib/${JDK_ARCH}/client/.debug/ \ -" - -FILES_${PN}-demo = " ${JDK_HOME}/demo ${JDK_HOME}/sample " -RDEPENDS_${PN}-demo = " ${PN} " - -FILES_${PN}-demo-dbg = "\ ${JDK_HOME}/demo/jvmti/gctest/lib/.debug/ \ ${JDK_HOME}/demo/jvmti/heapTracker/lib/.debug/ \ ${JDK_HOME}/demo/jvmti/heapViewer/lib/.debug/ \ @@ -64,6 +57,9 @@ FILES_${PN}-demo-dbg = "\ ${JDK_HOME}/demo/jvmti/compiledMethodLoad/lib/.debug/ \ " AFAIK as all ".debug" are included in the -dbg packages it should be fine if you remove the whole FILES_${PN}-dbg_append definition. I have tested it, that's OK after remove the whole FILES_${PN}-dbg_append definition. Do you mean that we should also remove FILES_${PN}-dbg_append? +FILES_${PN}-demo = " ${JDK_HOME}/demo ${JDK_HOME}/sample " +RDEPENDS_${PN}-demo = " ${PN} " + FILES_${PN}-doc_append = "\ ${JDK_HOME}/man \ ${JDK_HOME}/ASSEMBLY_EXCEPTION \ thanks®ards;Richard.L -- Thanks, Wenlin Kang -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 2/2] openjdk-8: combine the -dbg package
Hi Wenlin, as we clarified the "one -dbg package per recipe" thing I have some comments on the patch itself. On 06/07/2018 11:24 AM, Wenlin Kang wrote: > One recipe should only have one -dbg package, because OE only picks > up all .debug file into the last one -dbg package listed in variable > PACKAGES. May you please include a reference to that statement from "Ross Burton"? > > Signed-off-by: Wenlin Kang > --- > recipes-core/openjdk/openjdk-8_16xbyy.bb | 10 +++--- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/recipes-core/openjdk/openjdk-8_16xbyy.bb > b/recipes-core/openjdk/openjdk-8_16xbyy.bb > index dd0ed1d..1d7d794 100644 > --- a/recipes-core/openjdk/openjdk-8_16xbyy.bb > +++ b/recipes-core/openjdk/openjdk-8_16xbyy.bb > @@ -14,7 +14,6 @@ do_install() { > } > > PACKAGES_append = " \ > -${PN}-demo-dbg \ > ${PN}-demo \ > ${PN}-source \ > " > @@ -47,12 +46,6 @@ FILES_${PN}-dbg_append = "\ > ${JDK_HOME}/jre/lib/${JDK_ARCH}/headless/.debug/ \ > ${JDK_HOME}/jre/lib/${JDK_ARCH}/xawt/.debug/ \ > ${JDK_HOME}/jre/lib/${JDK_ARCH}/client/.debug/ \ > -" > - > -FILES_${PN}-demo = " ${JDK_HOME}/demo ${JDK_HOME}/sample " > -RDEPENDS_${PN}-demo = " ${PN} " > - > -FILES_${PN}-demo-dbg = "\ > ${JDK_HOME}/demo/jvmti/gctest/lib/.debug/ \ > ${JDK_HOME}/demo/jvmti/heapTracker/lib/.debug/ \ > ${JDK_HOME}/demo/jvmti/heapViewer/lib/.debug/ \ > @@ -64,6 +57,9 @@ FILES_${PN}-demo-dbg = "\ > ${JDK_HOME}/demo/jvmti/compiledMethodLoad/lib/.debug/ \ > " AFAIK as all ".debug" are included in the -dbg packages it should be fine if you remove the whole FILES_${PN}-dbg_append definition. > > +FILES_${PN}-demo = " ${JDK_HOME}/demo ${JDK_HOME}/sample " > +RDEPENDS_${PN}-demo = " ${PN} " > + > FILES_${PN}-doc_append = "\ > ${JDK_HOME}/man \ > ${JDK_HOME}/ASSEMBLY_EXCEPTION \ thanks®ards;Richard.L -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 2/2] openjdk-8: combine the -dbg package
Hi, On 06/11/2018 08:31 AM, Robert Yang wrote: > Hi Richard, > > On 06/08/2018 06:07 PM, Richard Leitner wrote: >> On 06/08/2018 11:02 AM, Wenlin Kang wrote: >>> On 2018年06月08日 15:39, Richard Leitner wrote: ... Nonehteless according to my first quick test the demo-dbg package contains lots of other debug information too... So maybe it would be the better way to fix the content of the different dbg packages rather than removing one? >>> >>> I also thought this, but after discussing with the other guys, the result >>> is a recipe can only have >>> a -dbg package, and this is OE's policy. >> >> Do you have a pointer to this discussion (or if it exists to the according >> documentation) for us? > > For oe-core's recipes, each recipe only has one dbg package, split dbg > packages > doesn't make any sense since they usually can't be run independently. Please > see oe-core's commit: > > commit a3b000643898d7402b9e57c02e8d10e677cc9722 > Author: Ross Burton > Date: Tue Dec 15 16:32:43 2015 + > > meta: more removals of redunant FILES_${PN}-dbg > > In some recipes overly-split -dbg packages were merged into PN-dbg. > Unless > there's a very good reason, recipes should have a single -dev and -dbg > package. Ok. Thank you for that pointer. That's definitely new to me, but I'm of course fine with it! regards;Richard.L -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 2/2] openjdk-8: combine the -dbg package
On 2018年06月08日 18:07, Richard Leitner wrote: On 06/08/2018 11:02 AM, Wenlin Kang wrote: On 2018年06月08日 15:39, Richard Leitner wrote: Hi, thank you for you patch! On 06/07/2018 11:24 AM, Wenlin Kang wrote: One recipe should only have one -dbg package, because OE only picks up all .debug file into the last one -dbg package listed in variable PACKAGES. Why should one recipe, altough it conains multiple packages have only one dbg package? Shouldn't the openjdk-8-demo-dbg package contain the debug information for the openjdk-8-demo package? This may be OE's policy, if one recipe contain multiple -dbg package , other -dbg packages all will be a empty pacakge, only have one will contain all .debug file, you can see the source "meta/classes/package.bbclass" But obviously the demo-dbg package isn't empty because it has its "FILES" defined ;-) Hi Richard You can check each -dbg directory under packages-split/, will find only one -dbg package has .debug file. 1129 python populate_packages () { 1130 import glob, re 1156 for pkg in packages.split(): 1157 if pkg in package_list: 1158 msg = "%s is listed in PACKAGES multiple times, this leads to packaging errors." % pkg 1159 package_qa_handle_error("packages-list", msg, d) 1160 # If debug-with-srcpkg mode is enabled then the src package will have 1161 # priority over dbg package when assigning the files. 1162 # This allows src package to include source files and remove them from dbg. 1163 elif split_source_package and pkg.endswith("-src"): 1164 package_list.insert(0, pkg) 1165 elif autodebug and pkg.endswith("-dbg") and not split_source_package: <== 1166 package_list.insert(0, pkg) 1167 else: 1168 package_list.append(pkg) 1169 d.setVar('PACKAGES', ' '.join(package_list)) 1170 pkgdest = d.getVar('PKGDEST') ... 1177 debug = [] 1178 for root, dirs, files in cpath.walk(dvar): 1179 dir = root[len(dvar):] 1180 if not dir: 1181 dir = os.sep 1182 for f in (files + dirs): 1183 path = "." + os.path.join(dir, f) 1184 if "/.debug/" in path or path.endswith("/.debug"): <== 1185 debug.append(path) 1186 Nonehteless according to my first quick test the demo-dbg package contains lots of other debug information too... So maybe it would be the better way to fix the content of the different dbg packages rather than removing one? I also thought this, but after discussing with the other guys, the result is a recipe can only have a -dbg package, and this is OE's policy. Do you have a pointer to this discussion (or if it exists to the according documentation) for us? Thanks & regards;Richard.L -- Thanks, Wenlin Kang -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 2/2] openjdk-8: combine the -dbg package
Hi Richard, On 06/08/2018 06:07 PM, Richard Leitner wrote: On 06/08/2018 11:02 AM, Wenlin Kang wrote: On 2018年06月08日 15:39, Richard Leitner wrote: Hi, thank you for you patch! On 06/07/2018 11:24 AM, Wenlin Kang wrote: One recipe should only have one -dbg package, because OE only picks up all .debug file into the last one -dbg package listed in variable PACKAGES. Why should one recipe, altough it conains multiple packages have only one dbg package? Shouldn't the openjdk-8-demo-dbg package contain the debug information for the openjdk-8-demo package? This may be OE's policy, if one recipe contain multiple -dbg package , other -dbg packages all will be a empty pacakge, only have one will contain all .debug file, you can see the source "meta/classes/package.bbclass" But obviously the demo-dbg package isn't empty because it has its "FILES" defined ;-) 1129 python populate_packages () { 1130 import glob, re 1156 for pkg in packages.split(): 1157 if pkg in package_list: 1158 msg = "%s is listed in PACKAGES multiple times, this leads to packaging errors." % pkg 1159 package_qa_handle_error("packages-list", msg, d) 1160 # If debug-with-srcpkg mode is enabled then the src package will have 1161 # priority over dbg package when assigning the files. 1162 # This allows src package to include source files and remove them from dbg. 1163 elif split_source_package and pkg.endswith("-src"): 1164 package_list.insert(0, pkg) 1165 elif autodebug and pkg.endswith("-dbg") and not split_source_package: <== 1166 package_list.insert(0, pkg) 1167 else: 1168 package_list.append(pkg) 1169 d.setVar('PACKAGES', ' '.join(package_list)) 1170 pkgdest = d.getVar('PKGDEST') ... 1177 debug = [] 1178 for root, dirs, files in cpath.walk(dvar): 1179 dir = root[len(dvar):] 1180 if not dir: 1181 dir = os.sep 1182 for f in (files + dirs): 1183 path = "." + os.path.join(dir, f) 1184 if "/.debug/" in path or path.endswith("/.debug"): <== 1185 debug.append(path) 1186 Nonehteless according to my first quick test the demo-dbg package contains lots of other debug information too... So maybe it would be the better way to fix the content of the different dbg packages rather than removing one? I also thought this, but after discussing with the other guys, the result is a recipe can only have a -dbg package, and this is OE's policy. Do you have a pointer to this discussion (or if it exists to the according documentation) for us? For oe-core's recipes, each recipe only has one dbg package, split dbg packages doesn't make any sense since they usually can't be run independently. Please see oe-core's commit: commit a3b000643898d7402b9e57c02e8d10e677cc9722 Author: Ross Burton Date: Tue Dec 15 16:32:43 2015 + meta: more removals of redunant FILES_${PN}-dbg In some recipes overly-split -dbg packages were merged into PN-dbg. Unless there's a very good reason, recipes should have a single -dev and -dbg package. // Robert // Robert Thanks & regards;Richard.L -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 2/2] openjdk-8: combine the -dbg package
On 06/08/2018 11:02 AM, Wenlin Kang wrote: > On 2018年06月08日 15:39, Richard Leitner wrote: >> Hi, >> thank you for you patch! >> >> On 06/07/2018 11:24 AM, Wenlin Kang wrote: >>> One recipe should only have one -dbg package, because OE only picks >>> up all .debug file into the last one -dbg package listed in variable >>> PACKAGES. >> Why should one recipe, altough it conains multiple packages have only >> one dbg package? Shouldn't the openjdk-8-demo-dbg package contain the >> debug information for the openjdk-8-demo package? > > This may be OE's policy, if one recipe contain multiple -dbg package , other > -dbg packages all will be > a empty pacakge, only have one will contain all .debug file, you can see the > source "meta/classes/package.bbclass" But obviously the demo-dbg package isn't empty because it has its "FILES" defined ;-) > > 1129 python populate_packages () { > 1130 import glob, re > > 1156 for pkg in packages.split(): > 1157 if pkg in package_list: > 1158 msg = "%s is listed in PACKAGES multiple times, this leads > to packaging errors." % pkg > 1159 package_qa_handle_error("packages-list", msg, d) > 1160 # If debug-with-srcpkg mode is enabled then the src package will > have > 1161 # priority over dbg package when assigning the files. > 1162 # This allows src package to include source files and remove > them from dbg. > 1163 elif split_source_package and pkg.endswith("-src"): > 1164 package_list.insert(0, pkg) > 1165 elif autodebug and pkg.endswith("-dbg") and not > split_source_package: <== > 1166 package_list.insert(0, pkg) > 1167 else: > 1168 package_list.append(pkg) > 1169 d.setVar('PACKAGES', ' '.join(package_list)) > 1170 pkgdest = d.getVar('PKGDEST') > ... > > 1177 debug = [] > 1178 for root, dirs, files in cpath.walk(dvar): > 1179 dir = root[len(dvar):] > 1180 if not dir: > 1181 dir = os.sep > 1182 for f in (files + dirs): > 1183 path = "." + os.path.join(dir, f) > 1184 if "/.debug/" in path or path.endswith("/.debug"): > <== > 1185 debug.append(path) > 1186 > >> >> Nonehteless according to my first quick test the demo-dbg package >> contains lots of other debug information too... >> So maybe it would be the better way to fix the content of the different >> dbg packages rather than removing one? > > I also thought this, but after discussing with the other guys, the result > is a recipe can only have > a -dbg package, and this is OE's policy. Do you have a pointer to this discussion (or if it exists to the according documentation) for us? Thanks & regards;Richard.L -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 2/2] openjdk-8: combine the -dbg package
On 2018年06月08日 17:02, Wenlin Kang wrote: On 2018年06月08日 15:39, Richard Leitner wrote: Hi, thank you for you patch! On 06/07/2018 11:24 AM, Wenlin Kang wrote: One recipe should only have one -dbg package, because OE only picks up all .debug file into the last one -dbg package listed in variable PACKAGES. Why should one recipe, altough it conains multiple packages have only one dbg package? Shouldn't the openjdk-8-demo-dbg package contain the debug information for the openjdk-8-demo package? This may be OE's policy, if one recipe contain multiple -dbg package , other -dbg packages all will be a empty pacakge, only have one will contain all .debug file, you can see the source "meta/classes/package.bbclass" 1129 python populate_packages () { 1130 import glob, re 1156 for pkg in packages.split(): 1157 if pkg in package_list: 1158 msg = "%s is listed in PACKAGES multiple times, this leads to packaging errors." % pkg 1159 package_qa_handle_error("packages-list", msg, d) 1160 # If debug-with-srcpkg mode is enabled then the src package will have 1161 # priority over dbg package when assigning the files. 1162 # This allows src package to include source files and remove them from dbg. 1163 elif split_source_package and pkg.endswith("-src"): 1164 package_list.insert(0, pkg) 1165 elif autodebug and pkg.endswith("-dbg") and not split_source_package: <== 1166 package_list.insert(0, pkg) 1167 else: 1168 package_list.append(pkg) 1169 d.setVar('PACKAGES', ' '.join(package_list)) 1170 pkgdest = d.getVar('PKGDEST') ... 1177 debug = [] 1178 for root, dirs, files in cpath.walk(dvar): 1179 dir = root[len(dvar):] 1180 if not dir: 1181 dir = os.sep 1182 for f in (files + dirs): 1183 path = "." + os.path.join(dir, f) 1184 if "/.debug/" in path or path.endswith("/.debug"): <== 1185 debug.append(path) 1186 1187 for pkg in package_list: 1188 root = os.path.join(pkgdest, pkg) 1189 bb.utils.mkdirhier(root) 1190 1191 filesvar = d.getVar('FILES_%s' % pkg) or "" 1192 if "//" in filesvar: 1193 msg = "FILES variable for package %s contains '//' which is invalid. Attempting to fix this but you should correct the metadata.\n" % pkg 1194 package_qa_handle_error("files-invalid", msg, d) 1195 filesvar.replace("//", "/") 1196 1197 origfiles = filesvar.split() 1198 files, symlink_paths = files_from_filevars(origfiles) 1199 1200 if autodebug and pkg.endswith("-dbg"): < 1201 files.extend(debug) < Nonehteless according to my first quick test the demo-dbg package contains lots of other debug information too... So maybe it would be the better way to fix the content of the different dbg packages rather than removing one? I also thought this, but after discussing with the other guys, the result is a recipe can only have a -dbg package, and this is OE's policy. But I'm of course open for discussions ;-) Signed-off-by: Wenlin Kang --- recipes-core/openjdk/openjdk-8_16xbyy.bb | 10 +++--- 1 file changed, 3 insertions(+), 7 deletions(-) regards;Richard.L -- Thanks, Wenlin Kang -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 2/2] openjdk-8: combine the -dbg package
On 2018年06月08日 15:39, Richard Leitner wrote: Hi, thank you for you patch! On 06/07/2018 11:24 AM, Wenlin Kang wrote: One recipe should only have one -dbg package, because OE only picks up all .debug file into the last one -dbg package listed in variable PACKAGES. Why should one recipe, altough it conains multiple packages have only one dbg package? Shouldn't the openjdk-8-demo-dbg package contain the debug information for the openjdk-8-demo package? This may be OE's policy, if one recipe contain multiple -dbg package , other -dbg packages all will be a empty pacakge, only have one will contain all .debug file, you can see the source "meta/classes/package.bbclass" 1129 python populate_packages () { 1130 import glob, re 1156 for pkg in packages.split(): 1157 if pkg in package_list: 1158 msg = "%s is listed in PACKAGES multiple times, this leads to packaging errors." % pkg 1159 package_qa_handle_error("packages-list", msg, d) 1160 # If debug-with-srcpkg mode is enabled then the src package will have 1161 # priority over dbg package when assigning the files. 1162 # This allows src package to include source files and remove them from dbg. 1163 elif split_source_package and pkg.endswith("-src"): 1164 package_list.insert(0, pkg) 1165 elif autodebug and pkg.endswith("-dbg") and not split_source_package: <== 1166 package_list.insert(0, pkg) 1167 else: 1168 package_list.append(pkg) 1169 d.setVar('PACKAGES', ' '.join(package_list)) 1170 pkgdest = d.getVar('PKGDEST') ... 1177 debug = [] 1178 for root, dirs, files in cpath.walk(dvar): 1179 dir = root[len(dvar):] 1180 if not dir: 1181 dir = os.sep 1182 for f in (files + dirs): 1183 path = "." + os.path.join(dir, f) 1184 if "/.debug/" in path or path.endswith("/.debug"): <== 1185 debug.append(path) 1186 Nonehteless according to my first quick test the demo-dbg package contains lots of other debug information too... So maybe it would be the better way to fix the content of the different dbg packages rather than removing one? I also thought this, but after discussing with the other guys, the result is a recipe can only have a -dbg package, and this is OE's policy. But I'm of course open for discussions ;-) Signed-off-by: Wenlin Kang --- recipes-core/openjdk/openjdk-8_16xbyy.bb | 10 +++--- 1 file changed, 3 insertions(+), 7 deletions(-) regards;Richard.L -- Thanks, Wenlin Kang -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 2/2] openjdk-8: combine the -dbg package
Hi, thank you for you patch! On 06/07/2018 11:24 AM, Wenlin Kang wrote: > One recipe should only have one -dbg package, because OE only picks > up all .debug file into the last one -dbg package listed in variable > PACKAGES. Why should one recipe, altough it conains multiple packages have only one dbg package? Shouldn't the openjdk-8-demo-dbg package contain the debug information for the openjdk-8-demo package? Nonehteless according to my first quick test the demo-dbg package contains lots of other debug information too... So maybe it would be the better way to fix the content of the different dbg packages rather than removing one? But I'm of course open for discussions ;-) > > Signed-off-by: Wenlin Kang > --- > recipes-core/openjdk/openjdk-8_16xbyy.bb | 10 +++--- > 1 file changed, 3 insertions(+), 7 deletions(-) regards;Richard.L -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 2/2] openjdk-8: combine the -dbg package
One recipe should only have one -dbg package, because OE only picks up all .debug file into the last one -dbg package listed in variable PACKAGES. Signed-off-by: Wenlin Kang --- recipes-core/openjdk/openjdk-8_16xbyy.bb | 10 +++--- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/recipes-core/openjdk/openjdk-8_16xbyy.bb b/recipes-core/openjdk/openjdk-8_16xbyy.bb index dd0ed1d..1d7d794 100644 --- a/recipes-core/openjdk/openjdk-8_16xbyy.bb +++ b/recipes-core/openjdk/openjdk-8_16xbyy.bb @@ -14,7 +14,6 @@ do_install() { } PACKAGES_append = " \ -${PN}-demo-dbg \ ${PN}-demo \ ${PN}-source \ " @@ -47,12 +46,6 @@ FILES_${PN}-dbg_append = "\ ${JDK_HOME}/jre/lib/${JDK_ARCH}/headless/.debug/ \ ${JDK_HOME}/jre/lib/${JDK_ARCH}/xawt/.debug/ \ ${JDK_HOME}/jre/lib/${JDK_ARCH}/client/.debug/ \ -" - -FILES_${PN}-demo = " ${JDK_HOME}/demo ${JDK_HOME}/sample " -RDEPENDS_${PN}-demo = " ${PN} " - -FILES_${PN}-demo-dbg = "\ ${JDK_HOME}/demo/jvmti/gctest/lib/.debug/ \ ${JDK_HOME}/demo/jvmti/heapTracker/lib/.debug/ \ ${JDK_HOME}/demo/jvmti/heapViewer/lib/.debug/ \ @@ -64,6 +57,9 @@ FILES_${PN}-demo-dbg = "\ ${JDK_HOME}/demo/jvmti/compiledMethodLoad/lib/.debug/ \ " +FILES_${PN}-demo = " ${JDK_HOME}/demo ${JDK_HOME}/sample " +RDEPENDS_${PN}-demo = " ${PN} " + FILES_${PN}-doc_append = "\ ${JDK_HOME}/man \ ${JDK_HOME}/ASSEMBLY_EXCEPTION \ -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel