Merge lp:~clint-fewbar/ubuntu/lucid/mongodb/sru-557024 into lp:ubuntu/lucid/mongodb

[Clint Byrum]

SRU to lucid that implements the same fix as was done in Maverick.

Tested build and running on clean schroot.

[lp:~clint-fewbar/ubuntu/lucid/mongodb/sru-557024]

11. By Clint Byrum on 2010-11-03

changing dist to lucid-proposed

[Stefano Rivera (stefanor)]

> debian/patches/debian-changes-1:1.4.4-2

Was that intentional?

[Clint Byrum (clint-fewbar)]

No, that got pulled in and I didn't notice it, removed and re-pushed.

[lp:~clint-fewbar/ubuntu/lucid/mongodb/sru-557024]

12. By Clint Byrum on 2010-11-06

removing debian-changes-1:1.4.4-2

[Stefano Rivera (stefanor)]

Now for a proper review:
1. Can we remove those lintian overrides?
2. Should we really be installing /usr/bin/xulwrapper?

review: Needs Fixing

[Stefano Rivera (stefanor)]

err regarding 1, I see that doesn't make it into the deb any more, that's OK then.

[lp:~clint-fewbar/ubuntu/lucid/mongodb/sru-557024]

13. By Clint Byrum on 2010-11-06

filtering xulwrapper from the symlinks for /usr/bin

[Stefano Rivera (stefanor)]

review: Approve

[Stefano Rivera (stefanor)]

Err I probably shouldn't have let that through with the added patch system. We don't like those in SRUs without good cause.

review: Needs Fixing

[Clint Byrum (clint-fewbar)]

Without the patches, the rpath will remain in the binaries, which was something made a priority in the dev fix.

Its not clear what I should do to fix this merge. Should the patches be made in the debian dir diff directly then, or not at all?

[lp:~clint-fewbar/ubuntu/lucid/mongodb/sru-557024]

14. By Clint Byrum on 2010-11-08

use dh_link for symlinks

15. By Clint Byrum on 2010-11-08

removing patch system -- patch applied inline

[Clint Byrum (clint-fewbar)]

Ok, much smaller patch now with inline changes and no quilt.

[lp:~clint-fewbar/ubuntu/lucid/mongodb/sru-557024]

16. By Clint Byrum on 2010-11-08

moving to proposed pocket

[Clint Byrum (clint-fewbar)]

This failed PPA build with this error:

dpkg-deb: building package `mongodb' in `../mongodb_1.2.2-1ubuntu1.1~ppa1_i386.deb'.
tar: ./usr/bin/mongo: file changed as we read it

I'm not really sure how this would happen. Any ideas anybody?

https://launchpad.net/~clint-fewbar/+archive/fixes/+build/2037554

It succeeds when building in a lucid schroot though.

[Stefano Rivera (stefanor)]

Yeah builds fine in my pbuilder and fails in PPAs, not sure what the problem is. You got anywhere with debugging it?

Looks like there's an unnecessary, whitespace-only hunk in debian/rules. Also whenever using \; in makefiles please use set -e (debian policy 4.6)

[Evan Broder (broder)]

I added a bunch of debugging code to the build rig and uploaded this: https://launchpad.net/~broder/+archive/ubuntu-tests/+build/2066048

I'm still not entirely sure what's going on, but something happens to the /usr/bin/mongo symlink. By the time you get to the bare, top-level dh_link invocation (i.e. just before dh_strip), the /usr/bin/mongo symlink is gone (because dh_link is touching all the symlinks and it doesn't touch that one)

[Evan Broder (broder)]

Curiouser and curiouser.

More debugging info in https://launchpad.net/~broder/+archive/ubuntu-tests/+build/2066065

One thing I noticed this time is that every time you run dh_link in the for loop, it touches each symlink you've created so far (touching them up to fix relative/absolute issues, etc.)

But it never touches /usr/bin/mongo after initially creating it, which makes me thing that something's going wrong more or less immediately when it's creating the symlink.

Also interesting is that the file size of /usr/bin/mongo is 25 bytes, which is the same as the length of "../lib/mongodb/xulwrapper", which makes me figure that /usr/bin/mongo's type is just getting marked wrong some how.

[lp:~clint-fewbar/ubuntu/lucid/mongodb/sru-557024]

17. By Clint Byrum on 2010-11-27

SConstruct: patching install to place executables in /usr/lib/mongodb

=== modified file 'SConstruct'
--- SConstruct	2010-02-17 08:50:07 +0000
+++ SConstruct	2010-11-27 09:30:12 +0000
@@ -552,8 +552,8 @@
     if not nojni:
         javaLibs += [ "java" , "jvm" ]
 
-    env.Append( LINKFLAGS="-Xlinker -rpath -Xlinker " + javaHome + "jre/lib/" + javaVersion + "/server" )
-    env.Append( LINKFLAGS="-Xlinker -rpath -Xlinker " + javaHome + "jre/lib/" + javaVersion  )
+    env.Append( LINKFLAGS="-Xlinker -Xlinker " + javaHome + "jre/lib/" + javaVersion + "/server" )
+    env.Append( LINKFLAGS="-Xlinker -Xlinker " + javaHome + "jre/lib/" + javaVersion  )
 
 if nix:
     env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
@@ -1296,9 +1296,9 @@
         e.Alias( name , name + ".exe" )
         name += ".exe"
 
-    inst = e.Install( installDir + "/bin" , name )
+    inst = e.Install( installDir + "/lib/mongodb" , name )
 
-    fullInstallName = installDir + "/bin/" + name
+    fullInstallName = installDir + "/lib/mongodb/" + name
 
     allBinaries += [ name ]
     if solaris or linux:

=== modified file 'buildscripts/hacks_ubuntu.py'
--- buildscripts/hacks_ubuntu.py	2010-04-23 00:43:22 +0000
+++ buildscripts/hacks_ubuntu.py	2010-11-27 09:30:12 +0000
@@ -36,7 +36,6 @@
         return False
     
     env.Prepend( LIBPATH=[ libroot ] )
-    env.Prepend( RPATH=[ libroot ] )
 
     env.Prepend( CPPPATH=[ incroot + "stable/" , 
                            incroot + "unstable/" ,
@@ -46,4 +45,8 @@
     env.Append( CPPDEFINES=[ "XULRUNNER" , "OLDJS" ] )
     if best.find( "1.9.0" ) >= 0:
         env.Append( CPPDEFINES=[ "XULRUNNER190" ] )
+
+    # Needed to run tests
+    env.AppendENVPath('LD_LIBRARY_PATH', libroot)
+
     return True

=== modified file 'debian/changelog'
--- debian/changelog	2010-04-23 00:43:22 +0000
+++ debian/changelog	2010-11-27 09:30:12 +0000
@@ -1,3 +1,16 @@
+mongodb (1:1.2.2-1ubuntu1.1) lucid-proposed; urgency=low
+
+  [ Clint Byrum ]
+  * debian/rules: install xulwrapper and symlinks to it (LP: #557024)
+    - add quilt commands to patch out rpath
+  * SConstruct, buildscripts/hacks_ubuntu.py: backported patch 
+    from maverick release 1:1.4.4-2ubuntu2 -- removes rpath
+
+  [ Evan Broder ]
+  * SConstruct: patching install to place executables in /usr/lib/mongodb
+
+ -- Clint Byrum <[e-mail]>  Sat, 27 Nov 2010 01:25:28 -0800
+
 mongodb (1:1.2.2-1ubuntu1) lucid; urgency=low
 
   [ Richard M Kreuter ]

=== modified file 'debian/rules'
--- debian/rules	2010-02-17 08:50:07 +0000
+++ debian/rules	2010-11-27 09:30:12 +0000
@@ -62,6 +62,7 @@
 	rm -f buildscripts/*.pyc 
 	rm -f *.pyc
 	rm -f buildinfo.cpp
+
 	dh_clean debian/files
 
 install: build
@@ -72,9 +73,10 @@
 
 	scons --prefix=$(CURDIR)/debian/mongodb/usr install
 
-	mkdir -p $(CURDIR)/debian/mongodb/usr/share/lintian/overrides/
-	install -m 644 $(CURDIR)/debian/lintian-overrides \
-		$(CURDIR)/debian/mongodb/usr/share/lintian/overrides/mongodb
+	install -m 755 $(CURDIR)/debian/xulwrapper $(CURDIR)/debian/mongodb/usr/lib/mongodb
+	for i in `ls $(CURDIR)/debian/mongodb/usr/lib/mongodb | grep -v xulwrapper` ; do \
+		dh_link usr/lib/mongodb/xulwrapper usr/bin/`basename $$i` ; \
+	done
 
 	mkdir -p $(CURDIR)/debian/mongodb/etc
 	install -m 644 $(CURDIR)/debian/mongodb.conf \

=== added file 'debian/xulwrapper'
--- debian/xulwrapper	1970-01-01 00:00:00 +0000
+++ debian/xulwrapper	2010-11-27 09:30:12 +0000
@@ -0,0 +1,32 @@
+#!/bin/sh
+# xulwrapper - a tiny wrapper for starting mongodb
+#
+# Copyright (c) 2010, Canonical Ltd.
+# Author: Clint Byrum <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+# This wrapper is necessary as xulrunner does not follow normal library sematics
+# Please see https://bugs.launchpad.net/ubuntu/+source/xulrunner-1.9.2/+bug/286906
+# for more information.
+#
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}/usr/lib/xulrunner-`xulrunner-1.9.2 --gre-version`
+bname=`basename $0`
+if [ "$bname" = "xulwrapper" ] ; then
+    echo xulwrapper must not be used to wrap itself. Paradox avoided.
+    exit 1
+fi
+exec "/usr/lib/mongodb/$bname" "$@"