Closed Bug 527076 Opened 10 years ago Closed 10 years ago

add deb repacks to MaemoNightlyRepackFactory

Categories

(Release Engineering :: General, defect)

x86
Maemo
defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: aki, Assigned: aki)

References

Details

Attachments

(2 files)

I'm hoping it's just adding 'make deb-AB_CD' to doRepack() and update the packageGlob, and test.

I can get to this next week if no one else grabs this bug.
Supplies are limited.
Act now.
Depends on: 490482
Note that we currently upload the multi-locale's deb file (overwriting the en-US deb file).
To speed up the work on this bug and not to wait on my work I believe you could just base it off the multi-locale deb for development/testing purposes.

Once we have something working based on the multi-locale deb file we can wait on my work before we turn this live.
Depends on: 524519
Blocks: 469290
Depends on: 527928
(In reply to comment #0)
> I can get to this next week if no one else grabs this bug.

Aki: are you still likely to get to this bug this week?
I can grab it.
Assignee: nobody → aki
I'm able to get pretty far without having to do weird scratchbox stuff.
The main issue I'm hitting is:

/scratchbox/users/cltbld/home/cltbld/build/maemo-trunk-l10n/mozilla-central/config/nsinstall -D be
cd ../../dist/xpi-stage/locale-be && \
	  tar --exclude=install.rdf --exclude=chrome.manifest --exclude=crashreporter.app -cvhf - * | ( cd /builds/scratchbox/users/cltbld/home/cltbld/build/maemo-trunk-l10n/mozilla-central/mobile/locales/data-stage//usr/local/lib/fennec-1.0b6pre/fennec && tar -xf - )
chrome/
chrome/be.jar
/bin/sh: line 1: cd: /builds/scratchbox/users/cltbld/home/cltbld/build/maemo-trunk-l10n/mozilla-central/mobile/locales/data-stage//usr/local/lib/fennec-1.0b6pre/fennec: No such file or directory

It's there, but it's usr/local/fennec-1.0b6pre/fennec, not usr/local/lib/fennec-1.0b6pre/fennec.  Does anyone know where the 'lib' is coming from?  It's part of $(installdir).
That's from http://hg.mozilla.org/build/buildbot-configs/file/2ddbb56ab603/mozilla2/linux/mobile-browser/nightly/mozconfig#l18, the maemo builds specify both prefix and libdir in configure, and the l10n builds need to, too.
Ok.  A few things:

* I needed the .mozconfig to get the correct libdir.  I'm able to get this by using the same mozconfig that the build uses.  I've put the relevant vars in BaseRepackFactory in case we want to do that for other repack factories.

* In a similar vein, I moved all the configure-type steps into a self.configure() in BaseRepackFactory.  I don't override this currently, but it's possible to do so.  Some more details about this in bug 482447.

* I was able to avoid using /scratchbox commands by specifying DEB_BUILD_ARCH=armel.  I'm happy about this since Axel didn't like my patch in bug 506989 and I wasn't fond the wrapper function.

* I'm still using packageGlob instead of Armen's new make upload.  Today I remembered jhford's hack of putting a '-r' into packageGlob, which gets passed to scp, effectively allowing you to upload a directory.  I hope Armen doesn't kill me; the make upload was wanted for a long time and we can start using that.  This works for now, though.

* I tested be and fr, and was able to install each via dpkg on an n800, and noted the locale strings on each start page.  I thought 'be' was Belgian (is that Flemish?) but it looks more like Belarus?  The fr is pretty clearly French, though.

Patch 1 of 2; a quick buildbot-configs patch incoming.
Attachment #412119 - Flags: review?(ccooper)
Comment on attachment 412119 [details] [diff] [review]
deb repacks, buildbotcustom

The doRepack can be done in just one step, I think:

make installer-%(locale)s deb-%(locale)s ...

That way, the langpack is only built once.

The other thing I'd like to see is an assert in MaemoNightlyRepackFactory.__init__ to assert self.configRepoPath, so that an configuration error would trigger on master start, and not on build start. I find the constructor argument name 'mozconfig' to be confusing, but that seems to be consistent with other parts.
Attachment #412119 - Flags: review?(ccooper) → review+
Attachment #412120 - Flags: review?(ccooper) → review+
Bah, bugzilla ate my comments because I collided with myself!

(In reply to comment #8)
> (From update of attachment 412119 [details] [diff] [review])
> The doRepack can be done in just one step, I think:
> 
> make installer-%(locale)s deb-%(locale)s ...
> 
> That way, the langpack is only built once.

Axel's way is a little simpler/cleaner.  If you have time to test it out prior to landing, you can assume an r+ for me there too.
 
> The other thing I'd like to see is an assert in
> MaemoNightlyRepackFactory.__init__ to assert self.configRepoPath, so that an
> configuration error would trigger on master start, and not on build start. I
> find the constructor argument name 'mozconfig' to be confusing, but that seems
> to be consistent with other parts.

Agreed. We do the same thing with the inipath for l10n repacks and it avoids hidden config snafus on reconfig/restart. r+ with that change.
Comment on attachment 412119 [details] [diff] [review]
deb repacks, buildbotcustom

http://hg.mozilla.org/build/buildbotcustom/rev/1545d31b5e92

Thanks for the pointers; added the assert + joined the make repack steps.
Attachment #412119 - Flags: checked-in+
Comment on attachment 412120 [details] [diff] [review]
update the packageGlob and pass mozconfig-specific info

http://hg.mozilla.org/build/buildbot-configs/rev/1a2b27ac8dbd

(tested on staging, too)
Attachment #412120 - Flags: checked-in+
Status: NEW → RESOLVED
Closed: 10 years ago
Resolution: --- → FIXED
Product: mozilla.org → Release Engineering
You need to log in before you can comment on or make changes to this bug.