r3563 - in developers/john_lee/toolkit: . bin
john_lee at sita.openmoko.org
john_lee at sita.openmoko.org
Tue Dec 4 16:47:26 CET 2007
Author: john_lee
Date: 2007-12-04 16:47:21 +0100 (Tue, 04 Dec 2007)
New Revision: 3563
Modified:
developers/john_lee/toolkit/README
developers/john_lee/toolkit/bin/om-conf
developers/john_lee/toolkit/bin/om-make-ipkg
Log:
* improve om-make-ipkg, enable custom ipkg control file
* remove set -x
* update README, add the new function of om-make-ipkg
Modified: developers/john_lee/toolkit/README
===================================================================
--- developers/john_lee/toolkit/README 2007-12-04 15:12:10 UTC (rev 3562)
+++ developers/john_lee/toolkit/README 2007-12-04 15:47:21 UTC (rev 3563)
@@ -39,9 +39,13 @@
If the application need extra configure or autoreconf arguments, they
could be specified when executing `conf.sh':
-EXTRA_OECONF=" --without-foo --enable-bar" om-conf <myapp>
+$ EXTRA_OECONF=" --without-foo --enable-bar" om-conf <myapp>
+Can specify your own ipkg control file, if you know what you're doing:
+$ om-make-ipkg myapp myapp_control
+
+
Document
========
Modified: developers/john_lee/toolkit/bin/om-conf
===================================================================
--- developers/john_lee/toolkit/bin/om-conf 2007-12-04 15:12:10 UTC (rev 3562)
+++ developers/john_lee/toolkit/bin/om-conf 2007-12-04 15:47:21 UTC (rev 3563)
@@ -1,6 +1,6 @@
#!/bin/sh
-set -ex
+set -e
# extract/modified from OE autotools.bbclass
# this scripts will call native autoconf tools. if it's not installed
Modified: developers/john_lee/toolkit/bin/om-make-ipkg
===================================================================
--- developers/john_lee/toolkit/bin/om-make-ipkg 2007-12-04 15:12:10 UTC (rev 3562)
+++ developers/john_lee/toolkit/bin/om-make-ipkg 2007-12-04 15:47:21 UTC (rev 3563)
@@ -1,34 +1,28 @@
#!/bin/sh
-set -ex
+set -e
error_exit () {
- echo usage: $(basename $0) [app_dir_name]
+ echo usage: $(basename ${0}) [app_dir_name] [ipkg_control_file]
exit 1
}
test x${OMTOOL_DIR} = x && . /usr/local/openmoko/arm/setup-env
-
. ${OMTOOL_DIR}/arm/scripts/functions
-test x$1 = x && error_exit
-S=$(absolute_path $1)
-test ! -d $S && error_exit
+S=${1}
+(test x${S} = x || test ! -d ${S}) && error_exit
appname=$(basename ${S})
-tmpdir=${TMPDIR}
-test x${tmpdir} = x && tmpdir=/tmp/${appname}-ipkg-tmp
-test -e "${tmpdir}" && (\
-echo Please specify environment variable TMPDIR. Cannot use ${tmpdir} because it already exists.; \
-exit 1;\
-)
+tmpdir=/tmp/${appname}-ipkg-tmp
+test -e "${tmpdir}" && echo Cannot use ${tmpdir} because it already exists. && exit 1
-oldpwd=$(pwd)
-cd ${S}
-make install DESTDIR="${tmpdir}"
-cd ${tmpdir}
-mkdir CONTROL
-cat >CONTROL/control <<EOF
+make -C ${S} install DESTDIR="${tmpdir}"
+mkdir ${tmpdir}/CONTROL
+control_file=${2}
+if test x${control_file} = x
+then
+ cat >${tmpdir}/CONTROL/control <<EOF
Package: $appname
Version: 0.1
Description: package built by openmoko toolchain
@@ -40,5 +34,9 @@
Depends:
Source: ${S}
EOF
-ipkg-build -o 0 -g 0 ${tmpdir} ${oldpwd}
+else
+ cp ${control_file} ${tmpdir}/CONTROL/control
+fi
+
+ipkg-build -o 0 -g 0 ${tmpdir}
rm -rf ${tmpdir}
More information about the commitlog
mailing list