On Thursday 27 March 2008 01:46:18 Holger Freyther wrote: > Hey, > > I'm in the process[1] of uploading two branches. Please test and propagate > them. > > > org.openmoko.zecke.autotools-bustage: > - Check the invariant of oe_libinstall > - Do not use oe_libinstall in autotools_stage_all > - Unify the mangling > > org.openmoko.zecke.efl-update > - Update EFL to the 23 of March (22nd was broken) > and more recent
Okay, mtn push of a new branch is not possible as my GPRS connections is disconnected before this operation is finished. Let us go back to patches and then to git (a good patch manager). Attached are: mtn-format-patch my git-format-patch inspired tool. The todolist is longer than this shell script. :) 0000-0002-notyet.patch: For the autotools/evas/efl bustage 0000-notyet_efl.patch: For bumping the SRCDATE of EFL stuff
mtn-format-patch.sh
Description: application/shellscript
-----------------------------------------------------------------
Revision: c355797dfd16bf24d9f26561506f702a0b2f15c1
Ancestor: e7def8445b0faf345e85aefb8555c0d58ff70bb0
Author: [EMAIL PROTECTED]
Date: 2008-03-26T18:54:08
Branch: org.openmoko.zecke.autotools-bustage
Modified files:
classes/base.bbclass
ChangeLog:
classes/base.bbclass: This code only works if the dotlai name is unique. Fail if it is not
This will make evas-native fail.
#
#
# patch "classes/base.bbclass"
# from [4d25edd67b14eaf17a59f9a302de6db47d325d27]
# to [88f68f4820edce9ee8fd2c6e8ab4ccbc761cad97]
#
============================================================
--- classes/base.bbclass 4d25edd67b14eaf17a59f9a302de6db47d325d27
+++ classes/base.bbclass 88f68f4820edce9ee8fd2c6e8ab4ccbc761cad97
@@ -287,7 +287,16 @@ oe_libinstall() {
if [ -z "$dir" ]; then
dir=`pwd`
fi
+
dotlai=$libname.lai
+
+ # Sanity check that the libname.lai is unique
+ number_of_files=`(cd $dir; find . -name "$dotlai") | wc -l`
+ if [ $number_of_files -ne 1 ]; then
+ oefatal "oe_libinstall: $dotlai is not unique in $dir"
+ fi
+
+
dir=$dir`(cd $dir;find . -name "$dotlai") | sed "s/^\.//;s/\/$dotlai\$//;q"`
olddir=`pwd`
__runcmd cd $dir
-----------------------------------------------------------------
Revision: 37f99cc2830468372dcf809d72a565ab6a3389f4
Ancestor: c355797dfd16bf24d9f26561506f702a0b2f15c1
Author: [EMAIL PROTECTED]
Date: 2008-03-26T23:58:36
Branch: org.openmoko.zecke.autotools-bustage
Modified files:
classes/autotools.bbclass
ChangeLog:
classes/autotools.bbclass: Installing libs from ${S} breaks if the lib name is not unique
With evas all plugins have the same name (module.so) and oe_libinstall
will fail. Use custom copying of .so and .a and mangle the .la (from
oe_libinstall). evas-native is working now.
#
#
# patch "classes/autotools.bbclass"
# from [aca69d07902b5d16cc3be9cc17ba2089144114e5]
# to [a66c6e69c981db19d05eb4e04e21e744b2c614d7]
#
============================================================
--- classes/autotools.bbclass aca69d07902b5d16cc3be9cc17ba2089144114e5
+++ classes/autotools.bbclass a66c6e69c981db19d05eb4e04e21e744b2c614d7
@@ -205,8 +205,17 @@ autotools_stage_all() {
for i in $las
do
dir=$(dirname $i)
- echo "oe_libinstall -C ${S} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir}"
- oe_libinstall -C ${S} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir}
+ echo "i is $i ${STAGE_TEMP}/${libdir}"
+ install -d ${STAGING_LIBDIR}/${dir}
+ cp -pPR ${STAGE_TEMP}/${libdir}/${dir}/$(basename $i .la).so ${STAGING_LIBDIR}/${dir} || true
+ cp -pPR ${STAGE_TEMP}/${libdir}/${dir}/$(basename $i .la).a ${STAGING_LIBDIR}/${dir} || true
+ source_la=${STAGE_TEMP}/${libdir}/${dir}/$(basename $i .la).la
+ dest_la=${STAGING_LIBDIR}/${dir}/$(basename $i .la).la
+ rm -f $dest_la
+ sed -e 's/^installed=yes$/installed=no/' \
+ -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
+ -e "/^dependency_libs=/s,\([[:space:]']+\)${libdir},\1${STAGING_LIBDIR},g" \
+ $source_la > $dest_la
done
else
# Otherwise libtool wasn't used, and lib/ can be copied
-----------------------------------------------------------------
Revision: 5439f8a2f7fc8aea9b32a5d1af1bc53635604c40
Ancestor: 37f99cc2830468372dcf809d72a565ab6a3389f4
Author: [EMAIL PROTECTED]
Date: 2008-03-27T00:09:03
Branch: org.openmoko.zecke.autotools-bustage
Modified files:
classes/autotools.bbclass classes/base.bbclass
ChangeLog:
Share the libtool mangling code between base.bbclass and autotools.bbclass
#
#
# patch "classes/autotools.bbclass"
# from [a66c6e69c981db19d05eb4e04e21e744b2c614d7]
# to [c3ab3b6ca62ee816efe67db5ec1c41d986c657ca]
#
# patch "classes/base.bbclass"
# from [88f68f4820edce9ee8fd2c6e8ab4ccbc761cad97]
# to [0087d01583787596e6c941c62c87d195d07ab3b1]
#
============================================================
--- classes/autotools.bbclass a66c6e69c981db19d05eb4e04e21e744b2c614d7
+++ classes/autotools.bbclass c3ab3b6ca62ee816efe67db5ec1c41d986c657ca
@@ -212,10 +212,7 @@ autotools_stage_all() {
source_la=${STAGE_TEMP}/${libdir}/${dir}/$(basename $i .la).la
dest_la=${STAGING_LIBDIR}/${dir}/$(basename $i .la).la
rm -f $dest_la
- sed -e 's/^installed=yes$/installed=no/' \
- -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
- -e "/^dependency_libs=/s,\([[:space:]']+\)${libdir},\1${STAGING_LIBDIR},g" \
- $source_la > $dest_la
+ oe_manglela $source_la $dest_la
done
else
# Otherwise libtool wasn't used, and lib/ can be copied
============================================================
--- classes/base.bbclass 88f68f4820edce9ee8fd2c6e8ab4ccbc761cad97
+++ classes/base.bbclass 0087d01583787596e6c941c62c87d195d07ab3b1
@@ -229,6 +229,20 @@ oe_soinstall() {
ln -sf $libname $2/$solink
}
+oe_manglela() {
+ __runcmd () {
+ if [ -z "$silent" ]; then
+ echo >&2 "oe_manglela: $*"
+ fi
+ $*
+ }
+
+ __runcmd sed -e 's/^installed=yes$/installed=no/' \
+ -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
+ -e "/^dependency_libs=/s,\([[:space:]']+\)${libdir},\1${STAGING_LIBDIR},g" \
+ $1 > $2
+}
+
oe_libinstall() {
# Purpose: Install a library, in all its forms
# Example
@@ -332,10 +346,7 @@ oe_libinstall() {
# stop libtool using the final directory name for libraries
# in staging:
__runcmd rm -f $destpath/$libname.la
- __runcmd sed -e 's/^installed=yes$/installed=no/' \
- -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
- -e "/^dependency_libs=/s,\([[:space:]']+\)${libdir},\1${STAGING_LIBDIR},g" \
- $dotlai >$destpath/$libname.la
+ oe_manglela $dotlai $destpath/$libname.la
else
__runcmd install -m 0644 $dotlai $destpath/$libname.la
fi
-----------------------------------------------------------------
Revision: 38f32e08d110a697c8cd854d8d3315a6f88c18e8
Ancestor: e7def8445b0faf345e85aefb8555c0d58ff70bb0
Author: [EMAIL PROTECTED]
Date: 2008-03-26T19:24:06
Branch: org.openmoko.zecke.efl-update
Modified files:
conf/distro/include/sane-srcdates.inc
ChangeLog:
sane-srcdates: Update the EFL to a newer version. This day has the pkgconfig fix for ecore.
#
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [20d693a8ea203b3e5f9a1fe533b82f6d8c711e9b]
# to [ffc09348c54922cc7e736168f6f023802ab489b8]
#
============================================================
--- conf/distro/include/sane-srcdates.inc 20d693a8ea203b3e5f9a1fe533b82f6d8c711e9b
+++ conf/distro/include/sane-srcdates.inc ffc09348c54922cc7e736168f6f023802ab489b8
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
-EFL_SRCDATE = "20080129"
+EFL_SRCDATE = "20080325"
SRCDATE_edb-native ?= "${EFL_SRCDATE}"
SRCDATE_edb ?= "${EFL_SRCDATE}"
SRCDATE_eet-native ?= "${EFL_SRCDATE}"
