<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugzilla.yoctoproject.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.6"
          urlbase="https://bugzilla.yoctoproject.org/"
          
          maintainer="it-coreprojects-helpdesk@linuxfoundation.org"
>

    <bug>
          <bug_id>1100</bug_id>
          
          <creation_ts>2011-05-25 08:07:08 +0000</creation_ts>
          <short_desc>[emenlow/crownbay-noemgd] X window could not start up with sato-sdk image</short_desc>
          <delta_ts>2011-05-31 01:55:50 +0000</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>7</classification_id>
          <classification>Build System, Metadata &amp; Runtime</classification>
          <product>BSPs</product>
          <component>bsps-configuration</component>
          <version>unspecified</version>
          <rep_platform>All</rep_platform>
          <op_sys>Multiple</op_sys>
          <bug_status>VERIFIED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>High</priority>
          <bug_severity>critical</bug_severity>
          <target_milestone>1.1 M1</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Jiajun Xu">jiajun.xu</reporter>
          <assigned_to name="Dexuan Cui">dexuan.cui</assigned_to>
          <cc>bluelightning</cc>
    
    <cc>dexuan.cui</cc>
    
    <cc>dvhart</cc>
    
    <cc>richard.purdie</cc>
    
    <cc>sgw</cc>
    
    <cc>tom.zanussi</cc>
    
    <cc>yp.bsp.watcher</cc>
    
    <cc>yp.watcher</cc>
          
          
          <cf_os>---</cf_os>
          <cf_regression_type>---</cf_regression_type>
          
          <cf_docchange>---</cf_docchange>

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>13975</commentid>
    <comment_count>0</comment_count>
    <who name="Jiajun Xu">jiajun.xu</who>
    <bug_when>2011-05-25 08:07:08 +0000</bug_when>
    <thetext>Tree/Branch: Poky/1.1_M1
Poky Commit: fc55b224caa3eeac4abda099ec9ed505db59fb28
Meta Branch: 1.1_M1
Meta Commit: 1b227f8ed2df529cc13f7169b0c08ff3d0f8c812
Image Location:
emenlow:
http://autobuilder02.pokylinux.org/emenlow/nightly/20110521-1/machines/emenlow/x86_32/core-image-sato-sdk-live-emenlow-20110521070906.hddimg.bz2
crownbay:
http://autobuilder02.pokylinux.org/crownbay-noemgd/nightly/20110520-1/machines/crownbay/x86_32/core-image-sato-sdk-live-crownbay-noemgd-20110521035553.hddimg.bz2
blacksand:
http://autobuilder02.pokylinux.org/n450/nightly/20110521-1/machines/n450/x86_32/core-image-sato-sdk-live-n450-20110521102330.hddimg.bz2

With Yocto 1.1 M1 RC1 build, some -live BSP images could not have X window start up when booting from USB stick.

Parts of error messages are as below(I will attach detailed log tomorrow)
########
                           failed to load module &quot;intel&quot; (module does not exist , 0)
                           No drivers available
                           .......
                           Fatal server error:
                           no screens found
                           
                           xinit give up
                           xinit unable to commect to x server connection refused
########</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>13977</commentid>
    <comment_count>1</comment_count>
    <who name="Tom Zanussi">tom.zanussi</who>
    <bug_when>2011-05-25 10:06:13 +0000</bug_when>
    <thetext>Sounds like it could be a duplicate of 1072 (machine-specific xorg.confs not being picked up) e.g. crownbay shouldn&apos;t even be looking for module &quot;intel&quot;.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>13992</commentid>
    <comment_count>2</comment_count>
    <who name="Dexuan Cui">dexuan.cui</who>
    <bug_when>2011-05-26 01:12:09 +0000</bug_when>
    <thetext>(In reply to comment #0)
&gt; Tree/Branch: Poky/1.1_M1
&gt; Poky Commit: fc55b224caa3eeac4abda099ec9ed505db59fb28
&gt; Meta Branch: 1.1_M1
&gt; Meta Commit: 1b227f8ed2df529cc13f7169b0c08ff3d0f8c812
Hi Jiajun, how did you know the meta commit 1b227f? The autobuilder&apos;s file gitinfo only shows the commit number of poky master.

(In reply to comment #1)
&gt; Sounds like it could be a duplicate of 1072 (machine-specific xorg.confs not
&gt; being picked up) e.g. crownbay shouldn&apos;t even be looking for module &quot;intel&quot;.
Agree.
I checked the file core-image-sato-sdk-live-emenlow-20110521070906.hddimg.bz2 and the file xorg.conf in it is from
meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf
rather than
meta-intel/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf.
I&apos;m not sure what caused this, however, with MACHINE=&quot;emenlow&quot;, when I did &quot;bitbake xserver-xf86-config -c unpack -f&quot;, I found tmp/work/emenlow-poky-linux/xserver-xf86-config-0.1-r9/xorg.conf is just from 
meta-intel/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf! This means I can&apos;t reproduce this bug.
BTW: I used the same Poky Commit and Meta Commit as mentioned above by Jiajun.
This is really weird... Maybe this bug only happens on autobuilder somehow???

As to Bug 1072, Tom, do you still remember the commit numbers of poky master/mete-intel based on which you reported the bug? Can you please use &quot;bitbake xserver-xf86-config -c unpack -f&quot; to verify the bug is reproducible?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>13993</commentid>
    <comment_count>3</comment_count>
    <who name="Jiajun Xu">jiajun.xu</who>
    <bug_when>2011-05-26 06:46:30 +0000</bug_when>
    <thetext>(In reply to comment #2)
&gt; (In reply to comment #0)
&gt; &gt; Tree/Branch: Poky/1.1_M1
&gt; &gt; Poky Commit: fc55b224caa3eeac4abda099ec9ed505db59fb28
&gt; &gt; Meta Branch: 1.1_M1
&gt; &gt; Meta Commit: 1b227f8ed2df529cc13f7169b0c08ff3d0f8c812
&gt; Hi Jiajun, how did you know the meta commit 1b227f? The autobuilder&apos;s file
&gt; gitinfo only shows the commit number of poky master.
&gt; 

Dexuan,
I could get both poky and meta-intel commit from http://autobuilder.pokylinux.org:8010/builders/emenlow. There will be several build task on the page. You could click hyperlink of each build id. Any by checking the build time (RC1 build is triggered on May 20th), we could find which build is what we want. In the build page, http://autobuilder.pokylinux.org:8010/builders/emenlow/builds/47, there are detailed information for both poky and meta-intel commit.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>13994</commentid>
    <comment_count>4</comment_count>
    <who name="Jiajun Xu">jiajun.xu</who>
    <bug_when>2011-05-26 06:53:51 +0000</bug_when>
    <thetext>Update the title since blacksand could start X with live boot. And only crownbay-noemgd is tested since crownbay image build failed.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>14005</commentid>
    <comment_count>5</comment_count>
    <who name="Darren Hart">dvhart</who>
    <bug_when>2011-05-26 15:18:11 +0000</bug_when>
    <thetext>Tom or Darren to look at ASAP and ask Dexuan to assist if not root-caused today or tomorrow.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>14012</commentid>
    <comment_count>6</comment_count>
    <who name="Tom Zanussi">tom.zanussi</who>
    <bug_when>2011-05-26 15:40:42 +0000</bug_when>
    <thetext>(In reply to comment #2)
&gt; (In reply to comment #0)
&gt; &gt; Tree/Branch: Poky/1.1_M1
&gt; &gt; Poky Commit: fc55b224caa3eeac4abda099ec9ed505db59fb28
&gt; &gt; Meta Branch: 1.1_M1
&gt; &gt; Meta Commit: 1b227f8ed2df529cc13f7169b0c08ff3d0f8c812
&gt; Hi Jiajun, how did you know the meta commit 1b227f? The autobuilder&apos;s file
&gt; gitinfo only shows the commit number of poky master.
&gt; 
&gt; (In reply to comment #1)
&gt; &gt; Sounds like it could be a duplicate of 1072 (machine-specific xorg.confs not
&gt; &gt; being picked up) e.g. crownbay shouldn&apos;t even be looking for module &quot;intel&quot;.
&gt; Agree.
&gt; I checked the file core-image-sato-sdk-live-emenlow-20110521070906.hddimg.bz2
&gt; and the file xorg.conf in it is from
&gt; meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf
&gt; rather than
&gt; meta-intel/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf.
&gt; I&apos;m not sure what caused this, however, with MACHINE=&quot;emenlow&quot;, when I did
&gt; &quot;bitbake xserver-xf86-config -c unpack -f&quot;, I found
&gt; tmp/work/emenlow-poky-linux/xserver-xf86-config-0.1-r9/xorg.conf is just from 
&gt; meta-intel/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf!
&gt; This means I can&apos;t reproduce this bug.
&gt; BTW: I used the same Poky Commit and Meta Commit as mentioned above by Jiajun.
&gt; This is really weird... Maybe this bug only happens on autobuilder somehow???
&gt; 
&gt; As to Bug 1072, Tom, do you still remember the commit numbers of poky
&gt; master/mete-intel based on which you reported the bug? Can you please use
&gt; &quot;bitbake xserver-xf86-config -c unpack -f&quot; to verify the bug is reproducible?

I just updated bug 1072 with information that allows me to reproduce the xorg.conf problem.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>14013</commentid>
    <comment_count>7</comment_count>
    <who name="Tom Zanussi">tom.zanussi</who>
    <bug_when>2011-05-26 16:15:46 +0000</bug_when>
    <thetext>bitbake xserver-xf86-config -c unpack -f

for crownbay-noemgd

with the named commits shows a correct xorg.conf.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>14017</commentid>
    <comment_count>8</comment_count>
    <who name="Dexuan Cui">dexuan.cui</who>
    <bug_when>2011-05-26 19:09:34 +0000</bug_when>
    <thetext>(In reply to comment #7)
&gt; bitbake xserver-xf86-config -c unpack -f
&gt; for crownbay-noemgd
&gt; with the named commits shows a correct xorg.conf.

But in bug 1072, doing the bitbake for sugarbay  shows a wrong xorg.conf in your side.


In my side, doing the bitbake for menlow and sugarbay both shows a correct xorg.conf.

I&apos;m trying to figure out why I can&apos;t reproduce the bug...</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>14019</commentid>
    <comment_count>9</comment_count>
    <who name="Tom Zanussi">tom.zanussi</who>
    <bug_when>2011-05-26 20:20:22 +0000</bug_when>
    <thetext>(In reply to comment #8)
&gt; (In reply to comment #7)
&gt; &gt; bitbake xserver-xf86-config -c unpack -f
&gt; &gt; for crownbay-noemgd
&gt; &gt; with the named commits shows a correct xorg.conf.
&gt; 
&gt; But in bug 1072, doing the bitbake for sugarbay  shows a wrong xorg.conf in
&gt; your side.
&gt; 
&gt; 
&gt; In my side, doing the bitbake for menlow and sugarbay both shows a correct
&gt; xorg.conf.
&gt; 
&gt; I&apos;m trying to figure out why I can&apos;t reproduce the bug...

Because I thought there was no problem with crownbay noemgd, I did a complete new build of core-image-sato-live assuming the xorg.conf would be correct, but checking the xorg.conf I see it&apos;s the wrong one again.  I get this in xorg.conf:

Section &quot;Device&quot;
    Identifier    &quot;Intel Graphics Driver&quot;
    Driver        &quot;intel&quot;
EndSection


When I should get this:

Section &quot;Device&quot;
    Identifier  &quot;Generic VESA&quot;
    Driver      &quot;vesa&quot;
EndSection

The only difference I can see was that this was a fresh build of a whole image, where the other just built the package alone.

In this case, bitbake -c cleanall xserver-xf86-config followed by
bitbake xserver-xf86-config -c unpack -f still shows the problem</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>14021</commentid>
    <comment_count>10</comment_count>
    <who name="Darren Hart">dvhart</who>
    <bug_when>2011-05-26 21:13:46 +0000</bug_when>
    <thetext>Tom noticed that there was a difference between the ordering of the bbappend LOAD in the logs between a good and a bad unpack. In a good case it looks like this (using -DDDD):

DEBUG: Appending .bbappend file /home/dvhart/source/poky.git/meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend to /home/dvhart/source/poky.git/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
DEBUG: BB /home/dvhart/source/poky.git/meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend: handle(data, include)
DEBUG: LOAD /home/dvhart/source/poky.git/meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
DEBUG: Appending .bbappend file /home/dvhart/source/poky.git/layers/meta-intel/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend to /home/dvhart/source/poky.git/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
DEBUG: BB /home/dvhart/source/poky.git/layers/meta-intel/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend: handle(data, include)
DEBUG: LOAD /home/dvhart/source/poky.git/layers/meta-intel/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend


Where the meta-crownbay bbappend is added last. In a bad unpack, it looks like this:

DEBUG: Appending .bbappend file /usr/local/src/yocto/junk/meta-intel/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.b\
bappend to /usr/local/src/yocto/junk/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb                                         
DEBUG: BB /usr/local/src/yocto/junk/meta-intel/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend: handle(data, \
include)                                                                                                                                   
DEBUG: LOAD /usr/local/src/yocto/junk/meta-intel/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend              
DEBUG: Appending .bbappend file /usr/local/src/yocto/junk/meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend to /us\
r/local/src/yocto/junk/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb                                                       
DEBUG: BB /usr/local/src/yocto/junk/meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend: handle(data, include)       
DEBUG: LOAD /usr/local/src/yocto/junk/meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend  

Note that meta-yocto is added second. In each case, the priority of meta-yocto was 5 and the priority of meta-crownbay was 6.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>14022</commentid>
    <comment_count>11</comment_count>
    <who name="Darren Hart">dvhart</who>
    <bug_when>2011-05-26 21:59:43 +0000</bug_when>
    <thetext>Apparently the pathnames for the layers impact the order in which they are loaded. If I setup symlinks to mirror tomz&apos;s setup, I can reproduce the bug:

Good bblayers.conf:
BBLAYERS = &quot; \
  /home/dvhart/source/poky.git/meta \
  /home/dvhart/source/poky.git/meta-yocto \
  /home/dvhart/source/poky.git/layers/meta-intel/meta-crownbay \

Bad bblayers.conf:
BBLAYERS = &quot; \
  /usr/local/src/yocto/junk/meta \
  /usr/local/src/yocto/junk/meta-yocto \
  /usr/local/src/yocto/junk/meta-intel/meta-crownbay \

And note that these are indeed pointing to the same place:

$ ls -la /usr/local/src/yocto/junk/
total 8
drwxr-xr-x 2 root root 4096 2011-05-26 21:55 .
drwxr-xr-x 3 root root 4096 2011-05-26 21:52 ..
lrwxrwxrwx 1 root root   33 2011-05-26 21:55 meta -&gt; /home/dvhart/source/poky.git/meta
lrwxrwxrwx 1 root root   46 2011-05-26 21:54 meta-intel -&gt; /home/dvhart/source/poky.git/layers/meta-intel
lrwxrwxrwx 1 root root   39 2011-05-26 21:53 meta-yocto -&gt; /home/dvhart/source/poky.git/meta-yocto</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>14025</commentid>
    <comment_count>12</comment_count>
    <who name="Darren Hart">dvhart</who>
    <bug_when>2011-05-27 00:02:57 +0000</bug_when>
    <thetext>I&apos;ve arrived at root cause. After some instrumenting (patch to be attached in case anyone is interested) I learned that the root of the problem is that cooker.py BBCooker.collect_bbfiles() doesn&apos;t take priority or bblayers.conf ordering into account when preparing the files lists. The most relevant bit follows:

       newfiles = set()
        for f in files:
            bb.plain(&quot;parsing %s&quot; % f)
            if os.path.isdir(f):
                dirfiles = self.find_bbfiles(f)
                newfiles.update(dirfiles)
            else:
                globbed = glob.glob(f)
                if not globbed and os.path.exists(f):
                    globbed = [f]
                newfiles.update(globbed)
...
       bb.plain(&quot;xserver-xf86-config files:&quot;)
        for f in newfiles:
            if f.count(&quot;xserver-xf86-config&quot;) &gt; 0:
                bb.plain(&quot;  %s&quot; % f)


With the known good paths, this results in:
xserver-xf86-config files:
  /home/dvhart/source/poky.git/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
  /home/dvhart/source/poky.git/meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
  /home/dvhart/source/poky.git/layers/meta-intel/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend

With the known bad paths, this results in:
xserver-xf86-config files:
  /usr/local/src/yocto/junk/meta-intel/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
  /usr/local/src/yocto/junk/meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
  /usr/local/src/yocto/junk/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb

Note that in the bad path, the meta recipe is last in the list (taking precedence over the other files).

By using a python set type (which I gather is convenient for the bbmask mechanism) we lose any ordering that existed simply from the ordering of the layers in bblayers.conf. Consider the following:

In [1]: a=set()
In [2]: b=set()
In [3]: a.add(&quot;a&quot;)
In [4]: a.add(&quot;b&quot;)
In [5]: a.add(&quot;c&quot;)
In [6]: print list(a)
[&apos;a&apos;, &apos;c&apos;, &apos;b&apos;]

In [7]: b.add(&quot;z&quot;)
In [8]: b.add(&quot;y&quot;)
In [9]: b.add(&quot;x&quot;)
In [10]: print list(b)
[&apos;y&apos;, &apos;x&apos;, &apos;z&apos;]

Notice the difference in output order versus input order. If you replace the letters with the layer paths, you get the same sort of result. A proper fix for this probably involves ensuring files are enumerated in layer priority order.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>14026</commentid>
    <comment_count>13</comment_count>
      <attachid>168</attachid>
    <who name="Darren Hart">dvhart</who>
    <bug_when>2011-05-27 00:07:41 +0000</bug_when>
    <thetext>Created attachment 168
dvhart&apos;s bitbake instrumentation patch

Here is the instrumentation patch I used to track down the bbappend ordering issue in case it is of any use to anyone.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>14027</commentid>
    <comment_count>14</comment_count>
    <who name="Darren Hart">dvhart</who>
    <bug_when>2011-05-27 00:08:22 +0000</bug_when>
    <thetext>Removing Blacksand and setting to All as this is a core bitbake issue and really not machine specific.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>14054</commentid>
    <comment_count>15</comment_count>
    <who name="Richard Purdie">richard.purdie</who>
    <bug_when>2011-05-27 10:23:18 +0000</bug_when>
    <thetext>Master has a fix for this:
http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=00c71132d5a326546bbb7fdf173995c76a9e9803</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>14055</commentid>
    <comment_count>16</comment_count>
    <who name="Saul Wold">sgw</who>
    <bug_when>2011-05-27 10:44:38 +0000</bug_when>
    <thetext>Commited to master and cherry-picked to M1</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>14057</commentid>
    <comment_count>17</comment_count>
    <who name="Darren Hart">dvhart</who>
    <bug_when>2011-05-27 10:56:54 +0000</bug_when>
    <thetext>Please note that this is a workaround. It makes it so the order of repositories are honored in bblayers.conf, but it does not address the missing layer priority ordering. I&apos;ve opened a new bug for that: Bug 1125</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>14069</commentid>
    <comment_count>18</comment_count>
    <who name="Jiajun Xu">jiajun.xu</who>
    <bug_when>2011-05-31 01:55:50 +0000</bug_when>
    <thetext>Verify the bug with Yocto 1.1 M1 RC2 build, the bug is fixed. Detailed commit information:
Tree/Branch: Poky/1.1_M1
Poky Commit: 4ff7af11ef69849ef9c16f585eae58ac920b222b
Meta Branch: 1.1_M1
Meta Commit: fc719f0cd6530ce15148b4aa274f1644b461b298</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>168</attachid>
            <date>2011-05-27 00:07:41 +0000</date>
            <delta_ts>2011-05-27 00:07:41 +0000</delta_ts>
            <desc>dvhart&apos;s bitbake instrumentation patch</desc>
            <filename>bitbake-inst-dvhart.patch</filename>
            <type>text/plain</type>
            <size>3098</size>
            <attacher name="Darren Hart">dvhart</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL2JpdGJha2UvbGliL2JiL2NhY2hlLnB5IGIvYml0YmFrZS9saWIvYmIvY2Fj
aGUucHkKaW5kZXggZDA4M2M1MS4uMTQ2MDdhNCAxMDA2NDQKLS0tIGEvYml0YmFrZS9saWIvYmIv
Y2FjaGUucHkKKysrIGIvYml0YmFrZS9saWIvYmIvY2FjaGUucHkKQEAgLTUzMCw2ICs1MzAsMTMg
QEAgY2xhc3MgQ2FjaGUob2JqZWN0KToKICAgICAgICAgdHJ5OgogICAgICAgICAgICAgaWYgYXBw
ZW5kczoKICAgICAgICAgICAgICAgICBkYXRhLnNldFZhcignX19CQkFQUEVORCcsICIgIi5qb2lu
KGFwcGVuZHMpLCBiYl9kYXRhKQorICAgICAgICAgICAgICAgIGJiLnBsYWluKCIqKioqKioqKioq
KioqIF9fQkJBUFBFTkQgKioqKioqKioqKioqKioqKioiKQorICAgICAgICAgICAgICAgIGJiLnBs
YWluKCJGSUxFOiAlcyIgJSBiYmZpbGVfbG9jKQorICAgICAgICAgICAgICAgIGJiLnBsYWluKCJS
QVc6ICVzIiAlICIgIi5qb2luKGFwcGVuZHMpKQorICAgICAgICAgICAgICAgIGJiLnBsYWluKCJD
YWxsIFN0YWNrOiIpCisgICAgICAgICAgICAgICAgaW1wb3J0IGluc3BlY3QKKyAgICAgICAgICAg
ICAgICBiYi5wbGFpbigiIDw8ICIuam9pbihbaVszXSBmb3IgaSBpbiBpbnNwZWN0LnN0YWNrKClb
MTotNF1dKSkKKyAgICAgICAgICAgICAgICBiYi5wbGFpbigiKioqKioqKioqKioqKiBFTkQgKioq
KioqKioqKioqKioqKioiKQogICAgICAgICAgICAgYmJfZGF0YSA9IHBhcnNlLmhhbmRsZShiYmZp
bGUsIGJiX2RhdGEpCiAgICAgICAgICAgICBpZiBjaGRpcl9iYWNrOgogICAgICAgICAgICAgICAg
IG9zLmNoZGlyKG9sZHBhdGgpCmRpZmYgLS1naXQgYS9iaXRiYWtlL2xpYi9iYi9jb29rZXIucHkg
Yi9iaXRiYWtlL2xpYi9iYi9jb29rZXIucHkKaW5kZXggYTFjZDRkNy4uM2IzODE4MiAxMDA2NDQK
LS0tIGEvYml0YmFrZS9saWIvYmIvY29va2VyLnB5CisrKyBiL2JpdGJha2UvbGliL2JiL2Nvb2tl
ci5weQpAQCAtOTM3LDEyICs5MzcsMTggQEAgY2xhc3MgQkJDb29rZXI6CiAgICAgICAgIGlmIG5v
dCBsZW4oZmlsZXMpOgogICAgICAgICAgICAgZmlsZXMgPSBzZWxmLmdldF9iYmZpbGVzKCkKIAor
ICAgICAgICBiYi5wbGFpbigiY29sbGVjdF9iYmZpbGVzIikKKyAgICAgICAgZm9yIGYgaW4gZmls
ZXM6CisgICAgICAgICAgICBiYi5wbGFpbigiICAgICVzIiAlIGYpCisKICAgICAgICAgaWYgbm90
IGxlbihmaWxlcyk6CiAgICAgICAgICAgICBjb2xsZWN0bG9nLmVycm9yKCJubyByZWNpcGUgZmls
ZXMgdG8gYnVpbGQsIGNoZWNrIHlvdXIgQkJQQVRIIGFuZCBCQkZJTEVTPyIpCiAgICAgICAgICAg
ICBiYi5ldmVudC5maXJlKENvb2tlckV4aXQoKSwgc2VsZi5jb25maWd1cmF0aW9uLmV2ZW50X2Rh
dGEpCiAKKyAgICAgICAgYmIucGxhaW4oIkdlbmVyYXRpbmcgbmV3ZmlsZXM6IikKICAgICAgICAg
bmV3ZmlsZXMgPSBzZXQoKQogICAgICAgICBmb3IgZiBpbiBmaWxlczoKKyAgICAgICAgICAgIGJi
LnBsYWluKCJwYXJzaW5nICVzIiAlIGYpCiAgICAgICAgICAgICBpZiBvcy5wYXRoLmlzZGlyKGYp
OgogICAgICAgICAgICAgICAgIGRpcmZpbGVzID0gc2VsZi5maW5kX2JiZmlsZXMoZikKICAgICAg
ICAgICAgICAgICBuZXdmaWxlcy51cGRhdGUoZGlyZmlsZXMpCkBAIC05NjMsNyArOTY5LDEwIEBA
IGNsYXNzIEJCQ29va2VyOgogCiAgICAgICAgIGJiZmlsZXMgPSBbXQogICAgICAgICBiYmFwcGVu
ZCA9IFtdCisgICAgICAgIGJiLnBsYWluKCJ4c2VydmVyLXhmODYtY29uZmlnIGZpbGVzOiIpCiAg
ICAgICAgIGZvciBmIGluIG5ld2ZpbGVzOgorICAgICAgICAgICAgaWYgZi5jb3VudCgieHNlcnZl
ci14Zjg2LWNvbmZpZyIpID4gMDoKKyAgICAgICAgICAgICAgICBiYi5wbGFpbigiICAlcyIgJSBm
KQogICAgICAgICAgICAgaWYgYmJtYXNrIGFuZCBiYm1hc2tfY29tcGlsZWQuc2VhcmNoKGYpOgog
ICAgICAgICAgICAgICAgIGNvbGxlY3Rsb2cuZGVidWcoMSwgInNraXBwaW5nIG1hc2tlZCBmaWxl
ICVzIiwgZikKICAgICAgICAgICAgICAgICBtYXNrZWQgKz0gMQpAQCAtOTc1LDYgKzk4NCwxMSBA
QCBjbGFzcyBCQkNvb2tlcjoKICAgICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAgICAgY29s
bGVjdGxvZy5kZWJ1ZygxLCAic2tpcHBpbmcgJXM6IHVua25vd24gZmlsZSBleHRlbnNpb24iLCBm
KQogCisgICAgICAgIGJiLnBsYWluKCJ4c2VydmVyLXhmODYtY29uZmlnIGJiYXBwZW5kIGZpbGVz
OiIpCisgICAgICAgIGZvciBmIGluIGJiYXBwZW5kOgorICAgICAgICAgICAgaWYgZi5jb3VudCgi
eHNlcnZlci14Zjg2LWNvbmZpZyIpID4gMDoKKyAgICAgICAgICAgICAgICBiYi5wbGFpbigiICAl
cyIgJSBmKQorCiAgICAgICAgICMgQnVpbGQgYSBsaXN0IG9mIC5iYmFwcGVuZCBmaWxlcyBmb3Ig
ZWFjaCAuYmIgZmlsZQogICAgICAgICBmb3IgZiBpbiBiYmFwcGVuZDoKICAgICAgICAgICAgIGJh
c2UgPSBvcy5wYXRoLmJhc2VuYW1lKGYpLnJlcGxhY2UoJy5iYmFwcGVuZCcsICcuYmInKQpkaWZm
IC0tZ2l0IGEvYml0YmFrZS9saWIvYmIvcnVucXVldWUucHkgYi9iaXRiYWtlL2xpYi9iYi9ydW5x
dWV1ZS5weQppbmRleCA2Y2ExNGVjLi45Y2M3ZTNjIDEwMDY0NAotLS0gYS9iaXRiYWtlL2xpYi9i
Yi9ydW5xdWV1ZS5weQorKysgYi9iaXRiYWtlL2xpYi9iYi9ydW5xdWV1ZS5weQpAQCAtMTEwNyw2
ICsxMTA3LDkgQEAgY2xhc3MgUnVuUXVldWVFeGVjdXRlOgogICAgICAgICAgICAgb3MuZHVwMihu
ZXdzaSwgc3lzLnN0ZGluLmZpbGVubygpKQogCiAKKyAgICAgICAgICAgIGJiLnBsYWluKCJmb3Jr
X29mZl90YXNrOiIpCisgICAgICAgICAgICBiYi5wbGFpbigiICAgICAgIGZuOiAlcyIgJSBmbikK
KyAgICAgICAgICAgIGJiLnBsYWluKCIgIGFwcGVuZHM6ICVzIiAlIHNlbGYuY29va2VyLmdldF9m
aWxlX2FwcGVuZHMoZm4pKQogICAgICAgICAgICAgdGhlX2RhdGEgPSBiYi5jYWNoZS5DYWNoZS5s
b2FkRGF0YUZ1bGwoZm4sIHNlbGYuY29va2VyLmdldF9maWxlX2FwcGVuZHMoZm4pLCBzZWxmLmNv
b2tlci5jb25maWd1cmF0aW9uLmRhdGEpCiAKICAgICAgICAgICAgIGVudjIgPSBiYi5kYXRhLmV4
cG9ydF92YXJzKHRoZV9kYXRhKQo=
</data>

          </attachment>
      

    </bug>

</bugzilla>