[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [6437] minor fixes, patches for debian
|
From: |
Oliver Riesener |
|
Subject: |
[paparazzi-commits] [6437] minor fixes, patches for debian |
|
Date: |
Tue, 01 Mar 2011 12:30:49 +0000 |
Revision: 6437
http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6437
Author: olri
Date: 2011-03-01 12:30:48 +0000 (Tue, 01 Mar 2011)
Log Message:
-----------
minor fixes, patches for debian
Modified Paths:
--------------
toolchains/stm32/paparazzi-stm32-1.0.0/Makefile
toolchains/stm32/paparazzi-stm32-1.0.0/summon-arm-toolchain
Added Paths:
-----------
toolchains/stm32/paparazzi-stm32-1.0.0/develenv.sh
toolchains/stm32/paparazzi-stm32-1.0.0/patch_libcmsis_build
toolchains/stm32/paparazzi-stm32-1.0.0/patch_libstm32_build
toolchains/stm32/paparazzi-stm32-1.0.0/patch_libstm32usb_build
Modified: toolchains/stm32/paparazzi-stm32-1.0.0/Makefile
===================================================================
--- toolchains/stm32/paparazzi-stm32-1.0.0/Makefile 2011-01-28 22:42:38 UTC
(rev 6436)
+++ toolchains/stm32/paparazzi-stm32-1.0.0/Makefile 2011-03-01 12:30:48 UTC
(rev 6437)
@@ -35,3 +35,6 @@
clean:
rm -rf *~ sources build .binutils* .gcc* .gdb* .libcmsis* .libstm32*
.newlib* .openocd* build-arch-stamp build-indep-stamp configure-stamp
+
+package:
+ debian/rules binary
Added: toolchains/stm32/paparazzi-stm32-1.0.0/develenv.sh
===================================================================
--- toolchains/stm32/paparazzi-stm32-1.0.0/develenv.sh
(rev 0)
+++ toolchains/stm32/paparazzi-stm32-1.0.0/develenv.sh 2011-03-01 12:30:48 UTC
(rev 6437)
@@ -0,0 +1,13 @@
+#/bin/sh
+
+#
+# install needed debian packages
+#
+
+aptitude install \
+ libmpfr-dev\
+ libgmp3-dev\
+ libncurses5-dev\
+ libtool\
+ autoconf\
+ libftdi-dev
Property changes on: toolchains/stm32/paparazzi-stm32-1.0.0/develenv.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: toolchains/stm32/paparazzi-stm32-1.0.0/patch_libcmsis_build
===================================================================
--- toolchains/stm32/paparazzi-stm32-1.0.0/patch_libcmsis_build
(rev 0)
+++ toolchains/stm32/paparazzi-stm32-1.0.0/patch_libcmsis_build 2011-03-01
12:30:48 UTC (rev 6437)
@@ -0,0 +1,17 @@
+--- libcmsis-v1.10-2/Makefile.orig 2011-02-26 22:52:44.000000000 +0100
++++ libcmsis-v1.10-2/Makefile 2011-02-26 23:03:54.000000000 +0100
+@@ -37,8 +37,9 @@
+ install -d ${install_dir}/shared/doc/libcmsis/startup/iar
+ install -d ${install_dir}/shared/doc/libcmsis/startup/arm
+ install -d ${install_dir}/shared/doc/libcmsis/startup/gcc
+- install -C include/cmsis/*.h ${install_dir}/include/cmsis
+- install -C src/libcmsis.a ${install_dir}/lib
+- install -C doc/startup/iar/*
${install_dir}/shared/doc/libcmsis/startup/iar
+- install -C doc/startup/arm/*
${install_dir}/shared/doc/libcmsis/startup/arm
+- install -C doc/startup/gcc/*
${install_dir}/shared/doc/libcmsis/startup/gcc
++ install -t ${install_dir}/include/cmsis include/cmsis/*.h
++ install -t ${install_dir}/lib src/libcmsis.a
++ install -t ${install_dir}/shared/doc/libcmsis/startup/iar
doc/startup/iar/*
++ install -t ${install_dir}/shared/doc/libcmsis/startup/arm
doc/startup/arm/*
++ install -t ${install_dir}/shared/doc/libcmsis/startup/gcc
doc/startup/gcc/*
++
Added: toolchains/stm32/paparazzi-stm32-1.0.0/patch_libstm32_build
===================================================================
--- toolchains/stm32/paparazzi-stm32-1.0.0/patch_libstm32_build
(rev 0)
+++ toolchains/stm32/paparazzi-stm32-1.0.0/patch_libstm32_build 2011-03-01
12:30:48 UTC (rev 6437)
@@ -0,0 +1,10 @@
+--- libstm32-v3.0.0-1/Makefile.orig 2011-02-26 23:17:00.000000000 +0100
++++ libstm32-v3.0.0-1/Makefile 2011-02-26 23:17:30.000000000 +0100
+@@ -33,5 +33,5 @@
+
+ install:
+ install -d ${install_dir}/include/stm32
+- install -C include/stm32/*.h ${install_dir}/include/stm32
+- install -C src/libstm32.a ${install_dir}/lib
++ install -t ${install_dir}/include/stm32 include/stm32/*.h
++ install -t ${install_dir}/lib src/libstm32.a
Added: toolchains/stm32/paparazzi-stm32-1.0.0/patch_libstm32usb_build
===================================================================
--- toolchains/stm32/paparazzi-stm32-1.0.0/patch_libstm32usb_build
(rev 0)
+++ toolchains/stm32/paparazzi-stm32-1.0.0/patch_libstm32usb_build
2011-03-01 12:30:48 UTC (rev 6437)
@@ -0,0 +1,10 @@
+--- libstm32usb-v3.0.1-1/Makefile.orig 2011-02-27 16:45:28.000000000 +0100
++++ libstm32usb-v3.0.1-1/Makefile 2011-02-27 16:46:16.000000000 +0100
+@@ -33,5 +33,5 @@
+
+ install:
+ install -d ${install_dir}/include/stm32/usb
+- install -C include/stm32/usb/*.h ${install_dir}/include/stm32/usb
+- install -C src/libstm32usb.a ${install_dir}/lib
++ install -t ${install_dir}/include/stm32/usb include/stm32/usb/*.h
++ install -t ${install_dir}/lib src/libstm32usb.a
Modified: toolchains/stm32/paparazzi-stm32-1.0.0/summon-arm-toolchain
===================================================================
--- toolchains/stm32/paparazzi-stm32-1.0.0/summon-arm-toolchain 2011-01-28
22:42:38 UTC (rev 6436)
+++ toolchains/stm32/paparazzi-stm32-1.0.0/summon-arm-toolchain 2011-03-01
12:30:48 UTC (rev 6437)
@@ -2,6 +2,7 @@
# Written by Uwe Hermann <address@hidden>, released as public domain.
# Modified by Piot Esden-Tempski <address@hidden>, released as public domain.
# Modified by Poine <address@hidden>, released as public domain
+# Modified by olri <address@hidden>, released as public domain
TARGET=arm-none-eabi # Or: TARGET=arm-none-eabi
PREFIX=/opt/paparazzi/stm32 # Install location of your final
toolchain
@@ -27,6 +28,7 @@
#OPENOCD=openocd-0.4.0
LOCAL_MIRROR=/home/poine/sources_paparazzi_packages/stm32
+LOCAL_MIRROR=/tmp/savannah/stm32/local_mirror
export PATH="${PREFIX}/bin:${PATH}"
@@ -38,6 +40,9 @@
echo "Found Linux OS."
GCCFLAGS=
GDBFLAGS=
+ if [ `lsb_release -si` == "Debian" ] ; then
+ APPLY_DEBIAN_PATCHES=1
+ fi
;;
Darwin)
echo "Found Darwin OS."
@@ -137,6 +142,8 @@
bzip2 --stdout > ../libopenstm32-${LIBOPENSTM32}.tar.bz2
cd ..
rm -rf libopenstm32
+else
+ echo "Using local cached libopenstm32 sources..."
fi
fi
@@ -144,11 +151,19 @@
echo "Cloning openocd sources..."
git clone git://openocd.git.sourceforge.net/gitroot/openocd/openocd
pushd openocd
+ #olri submodule missing patch
+ git submodule init
+ git submodule update
git checkout 28ddefd0659048773fd6066d0265fca76ca036d5
- git archive --format=tar --prefix=${OPENOCD}/ master | \
- bzip2 --stdout > ../${OPENOCD}.tar.bz2
+ #olri git archive --format=tar --prefix=${OPENOCD}/ master | \
+ #olri bzip2 --stdout > ../${OPENOCD}.tar.bz2
popd
- rm -rf openocd
+ #olri
+ mv openocd $OPENOCD
+ tar cfj ${OPENOCD}.tar.bz2 $OPENOCD
+ rm -rf $OPENOCD
+ #olri
+ #olri rm -rf openocd
# echo "Downloading openocd sources..."
# wget -c
http://downloads.sourceforge.net/project/openocd/openocd/0.4.0/${OPENOCD}.tar.bz2?use_mirror=hivelocity
# piotr patch august 4 2010 : 28ddefd0659048773fd6066d0265fca76ca036d5
@@ -352,7 +367,13 @@
echo "******************************************************************"
tar xfj sources/libcmsis-${LIBCMSIS}.tar.bz2
cd libcmsis-${LIBCMSIS}
+ if [ ! -e "$APPLY_DEBIAN_PATCHES" ] ; then
echo "******************************************************************"
+ echo "* Patching libcmsis-${LIBCMSIS}"
+ echo "******************************************************************"
+ patch -p1 < ../patch_libcmsis_build >> ${BUILDLOG} 2>&1 || exit
+ fi
+ echo "******************************************************************"
echo "* Building libcmsis-${LIBCMSIS}"
echo "******************************************************************"
make arch_prefix=${TARGET} prefix=${PREFIX} 2>&1 >> ${BUILDLOG} || exit
@@ -363,7 +384,7 @@
cd ..
PATCH_CMSIS=`pwd`/patch_libcmsis
pushd ${PREFIX}
- patch -p2 < ${PATCH_CMSIS}
+ patch -p2 < ${PATCH_CMSIS} >> ${BUILDLOG} 2>&1 || exit
popd
echo "******************************************************************"
echo "* Cleaning up libcmsis-${LIBCMSIS}"
@@ -378,9 +399,15 @@
echo "******************************************************************"
tar xfj sources/libstm32-${LIBSTM32}.tar.bz2
cd libstm32-${LIBSTM32}
+ if [ ! -e "$APPLY_DEBIAN_PATCHES" ] ; then
echo "******************************************************************"
echo "* Patching libstm32-${LIBSTM32}"
echo "******************************************************************"
+ patch -p1 < ../patch_libstm32_build >> ${BUILDLOG} 2>&1 || exit
+ fi
+ echo "******************************************************************"
+ echo "* Patching libstm32-${LIBSTM32}"
+ echo "******************************************************************"
patch -p1 < ../patch_libstm32 >> ${BUILDLOG} 2>&1 || exit
echo "******************************************************************"
echo "* Building libstm32-${LIBSTM32}"
@@ -404,7 +431,13 @@
echo "******************************************************************"
tar xfj sources/libstm32usb-${LIBSTM32USB}.tar.bz2
cd libstm32usb-${LIBSTM32USB}
+ if [ ! -e "$APPLY_DEBIAN_PATCHES" ] ; then
echo "******************************************************************"
+ echo "* Patching libstm32usb-${LIBSTM32USB}"
+ echo "******************************************************************"
+ patch -p1 < ../patch_libstm32usb_build >> ${BUILDLOG} 2>&1 || exit
+ fi
+ echo "******************************************************************"
echo "* Building libstm32usb-${LIBSTM32USB}"
echo "******************************************************************"
make arch_prefix=${TARGET} prefix=${PREFIX} >> ${BUILDLOG} 2>&1 || exit
@@ -453,7 +486,7 @@
echo "******************************************************************"
| tee -a ${BUILDLOG}
echo "* Configuring ${OPENOCD}"
| tee -a ${BUILDLOG}
echo "******************************************************************"
| tee -a ${BUILDLOG}
- patch -p1 < ../patch_openocd
+ patch -p1 < ../patch_openocd >> ${BUILDLOG} 2>&1 || exit
./bootstrap >> ${BUILDLOG} 2>&1 || exit
./configure --prefix=${PREFIX} --enable-maintainer-mode \
--enable-ft2232_libftdi >> ${BUILDLOG} 2>&1 || exit
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paparazzi-commits] [6437] minor fixes, patches for debian,
Oliver Riesener <=