There was a local change that wasn't showing up in any of my diffs against the origin/master branch. I've landed the fix.
Sorry for the trouble, John On Oct 1, 2012, at 4:32 PM, John Ford wrote: > Is this the config.sh script in B2G? Did you update your copy of B2G? > > jford2:~/b2g/b2g-upstream $ ./config.sh unagi b2g-manifest/otoro.xml > Initialized empty Git repository in > /Volumes/Boot2Gecko/b2g-upstream/tmp_manifest_repo/.git/ > [master (root-commit) 5ae9ab6] manifest > 1 files changed, 115 insertions(+), 0 deletions(-) > create mode 100644 unagi.xml > Get tmp_manifest_repo > remote: Counting objects: 3, done. > remote: Compressing objects: 100% (2/2), done. > remote: Total 3 (delta 0), reused 0 (delta 0) > Unpacking objects: 100% (3/3), done. > From tmp_manifest_repo > * [new branch] master -> origin/master > > Your identity is: John Ford <j...@johnford.info> > If you want to change this, please re-run 'repo init' with --config-name > > repo initialized in /Volumes/Boot2Gecko/b2g-upstream > Fetching projects: 100% (90/90), done. > Syncing work tree: 100% (90/90), done. > > Pulling files from device > error: device not found > Found unknown firmware with build ID > Configuration failed > > > The failure there is that I don't have the device or a backup of it. > > John > > On Oct 1, 2012, at 4:18 PM, Jonathan Griffin wrote: > >> This change seems to have broken builds for the unagi (dogfooding) device: >> >> + ./config.sh unagi config/default-otoro.xml >> Initialized empty Git repository in >> /data/jenkins/jobs/build-unagi/workspace/tmp_manifest_repo/.git/ >> [master (root-commit) 2c6c728] manifest >> Committer: Jenkins Continuous Build server >> <jenk...@builder1.ateam.phx1.mozilla.com> >> Your name and email address were configured automatically based >> on your username and hostname. Please check that they are accurate. >> You can suppress this message by setting them explicitly: >> >> git config --global user.name "Your Name" >> git config --global user.email y...@example.com >> >> After doing this, you may fix the identity used for this commit with: >> >> git commit --amend --reset-author >> >> 1 file changed, 107 insertions(+) >> create mode 100644 unagi.xml >> Get tmp_manifest_repo >> From tmp_manifest_repo >> * [new branch] master -> origin/master >> fatal: manifest 'otoro.xml' not available >> fatal: manifest otoro.xml not found >> Repo sync failed >> Build step 'Execute shell' marked build as failure >> Archiving artifacts >> Finished: FAILURE >> >> >> Builds for the otoro are fine. >> >> Jonathan >> >> >> On 10/1/2012 2:33 PM, John Ford wrote: >>> These changes have landed, please update your B2G main repository. I've >>> tested these changes, but please let me know as soon as possible if you see >>> anything wrong. >>> >>> Please update your B2G clone to grab a copy of the updated helper scripts >>> which understand the new manifest repository layout. >>> >>> A couple of things to note: >>> >>> 1) I've left the old b2g-manifest branches in place temporarily to ease the >>> transition. As a result, changes to b2g-manifest need to be double landed. >>> I'm happy to help with this. >>> >>> 2) The interface to config.sh functions as it did before. There are two >>> environment variables that are now read: >>> BRANCH, default value 'master' -- this variable lets you specify which >>> branch of the b2g-manifest repository to look for the manifest on >>> GITREPO, default value 'git://github.com/mozilla-b2g/b2g-manifest' -- this >>> variable lets you specify where the b2g-manfiest repository lives >>> >>> 3) For those who use repo directly, you should switch the device you want >>> from the -b parameter to the -m parameter. This is because we no longer >>> have one branch for each device, we now have one branch for all devices and >>> named xml manifest files per device. Example: >>> >>> This command: ./repo -u git://github.com/mozilla-b2g/b2g-manifest -b otoro >>> becomes: ./repo -u git://github.com/mozilla-b2g/b2g-manifest -b >>> master -m otoro.xml >>> >>> Thanks, >>> >>> John >>> >>> >>> >>> >>> On Sep 13, 2012, at 11:57 AM, John Ford wrote: >>> >>>> NOTE: None of the content of the manifests will be changed by this, just >>>> how we invoke repo. >>>> >>>> On Sep 13, 2012, at 11:55 AM, John Ford wrote: >>>> >>>>> Hi, >>>>> >>>>> In order to improve the way we branch B2G, we want change how we store >>>>> b2g repo manifest files (mozilla-b2g/b2g-manifest). There is currently a >>>>> branch for each device and those branches contains a single default.xml >>>>> file describing the manifest file. The change is to have a branch for an >>>>> overall project branch (think Android's jellybean, donut branches) and >>>>> use named xml manifests for each device on those branches. >>>>> >>>>> Because the config.sh script is not managed by repo, your copy of >>>>> mozilla-b2g/B2G needs to be updated. The plan is to leave the old >>>>> default.xml files and branches in place for a little while to avoid >>>>> interruption. To make sure we don't have issues with manifest files >>>>> diverging, we will remove the old default.xml files and branches after a >>>>> reasonable amount of time. If you use config.sh, this change should be >>>>> invisible to you. If you use repo directly to manage your tree, you >>>>> should start using the -m flag with repo init to refer to the device you >>>>> want. An example would be 'repo init -u >>>>> git://github.com/mozilla-b2g/b2g-manifest -b master -m emulator.xml'. >>>>> Once you've initialized a repo tree, you don't need to pass the -m flag >>>>> to sync it. >>>>> >>>>> Please let me know as soon as possible if you have concerns that aren't >>>>> addressed. >>>>> >>>>> Thanks, >>>>> >>>>> John >>>>> >>>>> ======== >>>>> >>>>> If you haven't updated your B2G repository before the old manifests are >>>>> removed, you might see error messages that look like the following: >>>>> >>>>> $ ./config.sh otoro >>>>> Get git://github.com/mozilla-b2g/b2g-manifest >>>>> remote: Counting objects: 277, done. >>>>> remote: Compressing objects: 100% (124/124), done. >>>>> remote: Total 277 (delta 88), reused 252 (delta 65) >>>>> Receiving objects: 100% (277/277), 35.64 KiB, done. >>>>> Resolving deltas: 100% (88/88), done. >>>>> From git://github.com/mozilla-b2g/b2g-manifest >>>>> * [new branch] master -> origin/master >>>>> * [new branch] m4-demo -> origin/m4-demo >>>>> fatal: manifest 'default.xml' not available >>>>> fatal: manifest default.xml not found >>>>> ERROR: repo sync failed >>>>> >>>>> Or if you use repo directly: >>>>> >>>>> $ ./repo init -u git://github.com/mozilla-b2g/b2g-manifest >>>>> fatal: manifest 'default.xml' not available >>>>> fatal: manifest default.xml not found >>>>> >>>>> This is a sign that you need to update your B2G clone. >>> _______________________________________________ >>> dev-b2g mailing list >>> dev-b2g@lists.mozilla.org >>> https://lists.mozilla.org/listinfo/dev-b2g >> >> _______________________________________________ >> dev-b2g mailing list >> dev-b2g@lists.mozilla.org >> https://lists.mozilla.org/listinfo/dev-b2g > _______________________________________________ dev-b2g mailing list dev-b2g@lists.mozilla.org https://lists.mozilla.org/listinfo/dev-b2g
