[hipl-commit] [trunk] Rev 4611: fixed configuring hipl for maemo

  • From: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Fri, 28 May 2010 12:55:34 +0300

Committer: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx>
Date: 28/05/2010 at 12:55:34
Revision: 4611
Revision-id: rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  fixed configuring hipl for maemo

Modified:
  A  packaging/build-maemo-helper.sh
  M  configure.ac
  M  packaging/build-maemo.sh
  M  tools/hipl_autobuild.sh

=== modified file 'configure.ac'
--- configure.ac        2010-05-26 10:28:47 +0000
+++ configure.ac        2010-05-28 09:55:32 +0000
@@ -26,7 +26,7 @@
 AM_INIT_AUTOMAKE([foreign subdir-objects])
 AM_PROG_CC_C_O # Required in CentOS
 
-# Check for python for tools directory
+# Check for python for build-system and tools directory
 AM_PATH_PYTHON([2.4.3],, [:])
 AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
 

=== added file 'packaging/build-maemo-helper.sh'
--- packaging/build-maemo-helper.sh     1970-01-01 00:00:00 +0000
+++ packaging/build-maemo-helper.sh     2010-05-28 09:55:32 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# HIPL requires Python >= 2.5, this is a workaround to use
+# the installable python2.5 instead of the in-built 2.3.2
+export SBOX_REDIRECT_IGNORE=$SBOX_REDIRECT_IGNORE:/usr/bin/python
+export PATH=/usr/bin:$PATH
+dpkg-buildpackage -rfakeroot -b

=== modified file 'packaging/build-maemo.sh'
--- packaging/build-maemo.sh    2010-05-26 13:30:52 +0000
+++ packaging/build-maemo.sh    2010-05-28 09:55:32 +0000
@@ -49,11 +49,11 @@
     echo "-> Building HIPL"
     echo "    Unpacking tarball..."
     rm -rf $SCRATCHBOX_HOME/hipl*
-    tar -xvzf $HIPL/hipl-${VERSION}.tar.gz -C $SCRATCHBOX_HOME
+    tar -xvzf $HIPL/hipl-[0-9.]*.tar.gz -C $SCRATCHBOX_HOME
     echo "    Done."
 
     echo "    Compiling HIPL for Maemo..."
-    $SCRATCHBOX/login -d hipl-${VERSION} dpkg-buildpackage -rfakeroot -b
+    $SCRATCHBOX/login -d hipl-${VERSION} packaging/build-maemo-helper.sh
     echo "    Done."
 else
     echo "ERROR: $HIPL does not exist."

=== modified file 'tools/hipl_autobuild.sh'
--- tools/hipl_autobuild.sh     2010-05-26 21:40:32 +0000
+++ tools/hipl_autobuild.sh     2010-05-28 09:55:32 +0000
@@ -151,6 +151,6 @@
 run_program "rm -rf hipl-[0-9.]* hipl_*.changes hipl_*.deb"
 run_program "tar -xzf $CHECKOUT_DIR/hipl-[0-9.]*.tar.gz"
 # perform debian packaging (in maemo sdk env)
-run_program "$SCRATCHBOX_DIR/login -d hipl-[0-9.]* dpkg-buildpackage 
-rfakeroot -b"
+run_program "$SCRATCHBOX_DIR/login -d hipl-[0-9.]* 
packaging/build-maemo-helper.sh"
 
 cleanup 0

Other related posts:

  • » [hipl-commit] [trunk] Rev 4611: fixed configuring hipl for maemo - Rene Hummen