[openpilot] 01/01: Update patches to 15.02.02 version.
Anton Gladky
gladk at moszumanska.debian.org
Sat May 30 20:03:29 UTC 2015
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository openpilot.
commit 031291ce341c40688bb935479f85a8ea6d4344fe
Author: Anton Gladky <gladk at debian.org>
Date: Sat May 30 22:03:15 2015 +0200
Update patches to 15.02.02 version.
---
debian/changelog | 2 +-
debian/patches/0001-Update-openpilot.desktop.patch | 11 +++---
debian/patches/10_fix_makefile.patch | 21 ++---------
debian/patches/20_use_system_eigen3.patch | 36 +++++++++----------
debian/patches/30_use_system_libs.patch | 36 +++++++++----------
debian/patches/40_use_system_buildflags.patch | 6 ++--
debian/patches/50_set_tag.patch | 41 ++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 9 +++++
9 files changed, 98 insertions(+), 65 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3d14cb3..d7cf82a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-openpilot (15.02.01-dfsg1) unstable; urgency=low
+openpilot (15.02.02-dfsg1) unstable; urgency=low
* Initial import. (Closes: #782347)
diff --git a/debian/patches/0001-Update-openpilot.desktop.patch b/debian/patches/0001-Update-openpilot.desktop.patch
index d14cc45..ab0b457 100644
--- a/debian/patches/0001-Update-openpilot.desktop.patch
+++ b/debian/patches/0001-Update-openpilot.desktop.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Update openpilot.desktop.
package/linux/openpilot.desktop | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
-diff --git a/package/linux/openpilot.desktop b/package/linux/openpilot.desktop
-index 3a71981..5121b72 100644
---- a/package/linux/openpilot.desktop
-+++ b/package/linux/openpilot.desktop
+Index: OpenPilot-RELEASE-15.02.02/package/linux/openpilot.desktop
+===================================================================
+--- OpenPilot-RELEASE-15.02.02.orig/package/linux/openpilot.desktop
++++ OpenPilot-RELEASE-15.02.02/package/linux/openpilot.desktop
@@ -6,7 +6,6 @@ Exec=openpilotgcs
TryExec=openpilotgcs
Comment=Configure, Tune, Diagnose, Track, & Upgrade FW for OpenPilot solutions
@@ -20,6 +20,3 @@ index 3a71981..5121b72 100644
Icon=openpilot
Type=Application
-MimeType=application/openpilot.snapshot;
---
-2.1.4
-
diff --git a/debian/patches/10_fix_makefile.patch b/debian/patches/10_fix_makefile.patch
index f386e0b..607ac2c 100644
--- a/debian/patches/10_fix_makefile.patch
+++ b/debian/patches/10_fix_makefile.patch
@@ -4,10 +4,10 @@ Description: Drop some unnesseccary scopes in Makefile.
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-04-12
-Index: OpenPilot-RELEASE-15.02.01/Makefile
+Index: OpenPilot-RELEASE-15.02.02/Makefile
===================================================================
---- OpenPilot-RELEASE-15.02.01.orig/Makefile
-+++ OpenPilot-RELEASE-15.02.01/Makefile
+--- OpenPilot-RELEASE-15.02.02.orig/Makefile
++++ OpenPilot-RELEASE-15.02.02/Makefile
@@ -80,12 +80,7 @@ SANITIZE_DEPRECATED_VARS := USE_BOOTLOAD
$(foreach var, $(SANITIZE_DEPRECATED_VARS), $(eval $(call SANITIZE_VAR,$(var),deprecated)))
@@ -22,18 +22,3 @@ Index: OpenPilot-RELEASE-15.02.01/Makefile
# Decide on a verbosity level based on the V= parameter
export AT := @
ifndef V
-Index: OpenPilot-RELEASE-15.02.01/flight/templates/firmware_info.c.template
-===================================================================
---- OpenPilot-RELEASE-15.02.01.orig/flight/templates/firmware_info.c.template
-+++ OpenPilot-RELEASE-15.02.01/flight/templates/firmware_info.c.template
-@@ -48,8 +48,8 @@ const struct fw_version_info fw_version_
- const struct fw_version_info fw_version_blob __attribute__((used)) __attribute__((__section__(".fw_version_blob"))) = {
- #endif
- .magic = { 'O','p','F','w' },
-- .commit_hash_prefix = 0x${HASH8},
-- .timestamp = ${UNIXTIME},
-+ .commit_hash_prefix = 0,
-+ .timestamp = 0,
- .board_type = ${BOARD_TYPE},
- .board_revision = ${BOARD_REVISION},
- .commit_tag_name = "${FWTAG}",
diff --git a/debian/patches/20_use_system_eigen3.patch b/debian/patches/20_use_system_eigen3.patch
index ae3ad43..5969122 100644
--- a/debian/patches/20_use_system_eigen3.patch
+++ b/debian/patches/20_use_system_eigen3.patch
@@ -2,10 +2,10 @@ Description: use packaged version of eigen3-lib instead of embedded
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-04-12
-Index: OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/config.pro
+Index: OpenPilot-RELEASE-15.02.02/ground/openpilotgcs/src/plugins/config/config.pro
===================================================================
---- OpenPilot-RELEASE-15.02.01.orig/ground/openpilotgcs/src/plugins/config/config.pro
-+++ OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/config.pro
+--- OpenPilot-RELEASE-15.02.02.orig/ground/openpilotgcs/src/plugins/config/config.pro
++++ OpenPilot-RELEASE-15.02.02/ground/openpilotgcs/src/plugins/config/config.pro
@@ -6,7 +6,7 @@ QT += svg opengl qml quick
include(config_dependencies.pri)
@@ -15,10 +15,10 @@ Index: OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/config.
OTHER_FILES += \
Config.pluginspec \
-Index: OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/calibration/calibrationutils.h
+Index: OpenPilot-RELEASE-15.02.02/ground/openpilotgcs/src/plugins/config/calibration/calibrationutils.h
===================================================================
---- OpenPilot-RELEASE-15.02.01.orig/ground/openpilotgcs/src/plugins/config/calibration/calibrationutils.h
-+++ OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/calibration/calibrationutils.h
+--- OpenPilot-RELEASE-15.02.02.orig/ground/openpilotgcs/src/plugins/config/calibration/calibrationutils.h
++++ OpenPilot-RELEASE-15.02.02/ground/openpilotgcs/src/plugins/config/calibration/calibrationutils.h
@@ -28,9 +28,8 @@
#ifndef CALIBRATIONUTILS_H
@@ -30,10 +30,10 @@ Index: OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/calibra
#include <Eigen/LU>
#include <QList>
namespace OpenPilot {
-Index: OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/alignment-calibration.cpp
+Index: OpenPilot-RELEASE-15.02.02/ground/openpilotgcs/src/plugins/config/alignment-calibration.cpp
===================================================================
---- OpenPilot-RELEASE-15.02.01.orig/ground/openpilotgcs/src/plugins/config/alignment-calibration.cpp
-+++ OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/alignment-calibration.cpp
+--- OpenPilot-RELEASE-15.02.02.orig/ground/openpilotgcs/src/plugins/config/alignment-calibration.cpp
++++ OpenPilot-RELEASE-15.02.02/ground/openpilotgcs/src/plugins/config/alignment-calibration.cpp
@@ -1,5 +1,5 @@
#include "calibration.h"
-#include <Eigen/Core>
@@ -41,10 +41,10 @@ Index: OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/alignme
#include <Eigen/Cholesky>
#include <Eigen/Geometry>
-Index: OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/assertions.h
+Index: OpenPilot-RELEASE-15.02.02/ground/openpilotgcs/src/plugins/config/assertions.h
===================================================================
---- OpenPilot-RELEASE-15.02.01.orig/ground/openpilotgcs/src/plugins/config/assertions.h
-+++ OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/assertions.h
+--- OpenPilot-RELEASE-15.02.02.orig/ground/openpilotgcs/src/plugins/config/assertions.h
++++ OpenPilot-RELEASE-15.02.02/ground/openpilotgcs/src/plugins/config/assertions.h
@@ -24,7 +24,7 @@
#ifndef AHRS_ASSERTIONS_HPP
#define AHRS_ASSERTIONS_HPP
@@ -54,10 +54,10 @@ Index: OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/asserti
#include <cmath>
template<typename MatrixBase>
-Index: OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/calibration.h
+Index: OpenPilot-RELEASE-15.02.02/ground/openpilotgcs/src/plugins/config/calibration.h
===================================================================
---- OpenPilot-RELEASE-15.02.01.orig/ground/openpilotgcs/src/plugins/config/calibration.h
-+++ OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/calibration.h
+--- OpenPilot-RELEASE-15.02.02.orig/ground/openpilotgcs/src/plugins/config/calibration.h
++++ OpenPilot-RELEASE-15.02.02/ground/openpilotgcs/src/plugins/config/calibration.h
@@ -1,7 +1,7 @@
#ifndef AHRS_CALIBRATION_HPP
#define AHRS_CALIBRATION_HPP
@@ -67,10 +67,10 @@ Index: OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/calibra
#include <cstdlib>
using std::size_t;
using namespace Eigen;
-Index: OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/twostep.cpp
+Index: OpenPilot-RELEASE-15.02.02/ground/openpilotgcs/src/plugins/config/twostep.cpp
===================================================================
---- OpenPilot-RELEASE-15.02.01.orig/ground/openpilotgcs/src/plugins/config/twostep.cpp
-+++ OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/twostep.cpp
+--- OpenPilot-RELEASE-15.02.02.orig/ground/openpilotgcs/src/plugins/config/twostep.cpp
++++ OpenPilot-RELEASE-15.02.02/ground/openpilotgcs/src/plugins/config/twostep.cpp
@@ -28,7 +28,6 @@
#include <calibration.h>
diff --git a/debian/patches/30_use_system_libs.patch b/debian/patches/30_use_system_libs.patch
index e9c0bb5..12ade52 100644
--- a/debian/patches/30_use_system_libs.patch
+++ b/debian/patches/30_use_system_libs.patch
@@ -2,10 +2,10 @@ Description: use packaged versions of zlib, quazip and lib3ds instead of embedde
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-04-12
-Index: openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/glc_lib.pro
+Index: OpenPilot-RELEASE-15.02.02/ground/openpilotgcs/src/libs/glc_lib/glc_lib.pro
===================================================================
---- openpilot-15.02.01.orig/ground/openpilotgcs/src/libs/glc_lib/glc_lib.pro
-+++ openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/glc_lib.pro
+--- OpenPilot-RELEASE-15.02.02.orig/ground/openpilotgcs/src/libs/glc_lib/glc_lib.pro
++++ OpenPilot-RELEASE-15.02.02/ground/openpilotgcs/src/libs/glc_lib/glc_lib.pro
@@ -21,43 +21,13 @@ unix:UI_DIR = ./Build
DEPENDPATH += .
@@ -128,10 +128,10 @@ Index: openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/glc_lib.pro
include_glc_maths.files= $${HEADERS_GLC_MATHS}
include_glc_io.files= $${HEADERS_GLC_IO}
include_glc_scengraph.files= $${HEADERS_GLC_SCENEGRAPH}
-Index: openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/glc_ext.h
+Index: OpenPilot-RELEASE-15.02.02/ground/openpilotgcs/src/libs/glc_lib/glc_ext.h
===================================================================
---- openpilot-15.02.01.orig/ground/openpilotgcs/src/libs/glc_lib/glc_ext.h
-+++ openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/glc_ext.h
+--- OpenPilot-RELEASE-15.02.02.orig/ground/openpilotgcs/src/libs/glc_lib/glc_ext.h
++++ OpenPilot-RELEASE-15.02.02/ground/openpilotgcs/src/libs/glc_lib/glc_ext.h
@@ -29,7 +29,7 @@
#if !defined(Q_OS_MAC)
@@ -141,10 +141,10 @@ Index: openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/glc_ext.h
extern PFNGLPOINTPARAMETERFARBPROC glPointParameterf;
extern PFNGLPOINTPARAMETERFVARBPROC glPointParameterfv;
-Index: openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/io/glc_3dstoworld.cpp
+Index: OpenPilot-RELEASE-15.02.02/ground/openpilotgcs/src/libs/glc_lib/io/glc_3dstoworld.cpp
===================================================================
---- openpilot-15.02.01.orig/ground/openpilotgcs/src/libs/glc_lib/io/glc_3dstoworld.cpp
-+++ openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/io/glc_3dstoworld.cpp
+--- OpenPilot-RELEASE-15.02.02.orig/ground/openpilotgcs/src/libs/glc_lib/io/glc_3dstoworld.cpp
++++ OpenPilot-RELEASE-15.02.02/ground/openpilotgcs/src/libs/glc_lib/io/glc_3dstoworld.cpp
@@ -36,11 +36,11 @@
#include "../sceneGraph/glc_structoccurence.h"
@@ -162,10 +162,10 @@ Index: openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/io/glc_3dstoworld
#include <QFileInfo>
#include <QGLContext>
-Index: openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/io/glc_worldto3ds.cpp
+Index: OpenPilot-RELEASE-15.02.02/ground/openpilotgcs/src/libs/glc_lib/io/glc_worldto3ds.cpp
===================================================================
---- openpilot-15.02.01.orig/ground/openpilotgcs/src/libs/glc_lib/io/glc_worldto3ds.cpp
-+++ openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/io/glc_worldto3ds.cpp
+--- OpenPilot-RELEASE-15.02.02.orig/ground/openpilotgcs/src/libs/glc_lib/io/glc_worldto3ds.cpp
++++ OpenPilot-RELEASE-15.02.02/ground/openpilotgcs/src/libs/glc_lib/io/glc_worldto3ds.cpp
@@ -31,11 +31,11 @@
#include "../shading/glc_material.h"
@@ -183,10 +183,10 @@ Index: openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/io/glc_worldto3ds
#include "glc_worldto3ds.h"
-Index: openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/io/glc_worldto3dxml.cpp
+Index: OpenPilot-RELEASE-15.02.02/ground/openpilotgcs/src/libs/glc_lib/io/glc_worldto3dxml.cpp
===================================================================
---- openpilot-15.02.01.orig/ground/openpilotgcs/src/libs/glc_lib/io/glc_worldto3dxml.cpp
-+++ openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/io/glc_worldto3dxml.cpp
+--- OpenPilot-RELEASE-15.02.02.orig/ground/openpilotgcs/src/libs/glc_lib/io/glc_worldto3dxml.cpp
++++ OpenPilot-RELEASE-15.02.02/ground/openpilotgcs/src/libs/glc_lib/io/glc_worldto3dxml.cpp
@@ -23,8 +23,8 @@
#include "glc_worldto3dxml.h"
@@ -198,10 +198,10 @@ Index: openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/io/glc_worldto3dx
#include "../glc_exception.h"
#include "../geometry/glc_mesh.h"
-Index: openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/io/glc_3dxmltoworld.cpp
+Index: OpenPilot-RELEASE-15.02.02/ground/openpilotgcs/src/libs/glc_lib/io/glc_3dxmltoworld.cpp
===================================================================
---- openpilot-15.02.01.orig/ground/openpilotgcs/src/libs/glc_lib/io/glc_3dxmltoworld.cpp
-+++ openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/io/glc_3dxmltoworld.cpp
+--- OpenPilot-RELEASE-15.02.02.orig/ground/openpilotgcs/src/libs/glc_lib/io/glc_3dxmltoworld.cpp
++++ OpenPilot-RELEASE-15.02.02/ground/openpilotgcs/src/libs/glc_lib/io/glc_3dxmltoworld.cpp
@@ -30,8 +30,8 @@
#include "glc_xmlutil.h"
diff --git a/debian/patches/40_use_system_buildflags.patch b/debian/patches/40_use_system_buildflags.patch
index b2ee84a..614bfdb 100644
--- a/debian/patches/40_use_system_buildflags.patch
+++ b/debian/patches/40_use_system_buildflags.patch
@@ -2,10 +2,10 @@ Description: let dpkg-buildflags set neccessary flags for Qt-files
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-04-12
-Index: openpilot-15.02.01/Makefile
+Index: OpenPilot-RELEASE-15.02.02/Makefile
===================================================================
---- openpilot-15.02.01.orig/Makefile
-+++ openpilot-15.02.01/Makefile
+--- OpenPilot-RELEASE-15.02.02.orig/Makefile
++++ OpenPilot-RELEASE-15.02.02/Makefile
@@ -79,6 +79,10 @@ $(foreach var, $(SANITIZE_GCC_VARS), $(e
SANITIZE_DEPRECATED_VARS := USE_BOOTLOADER CLEAN_BUILD
$(foreach var, $(SANITIZE_DEPRECATED_VARS), $(eval $(call SANITIZE_VAR,$(var),deprecated)))
diff --git a/debian/patches/50_set_tag.patch b/debian/patches/50_set_tag.patch
new file mode 100644
index 0000000..79b11bd
--- /dev/null
+++ b/debian/patches/50_set_tag.patch
@@ -0,0 +1,41 @@
+Description: set tag and date for firmware
+ orifinal build script uses git to set tag
+ and firmware date. During package build usually
+ .git-meta information is not available. Thus
+ we are setting those parameters from the
+ changelog file.
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2015-05-30
+
+Index: OpenPilot-RELEASE-15.02.02/make/scripts/version-info.py
+===================================================================
+--- OpenPilot-RELEASE-15.02.02.orig/make/scripts/version-info.py
++++ OpenPilot-RELEASE-15.02.02/make/scripts/version-info.py
+@@ -16,6 +16,7 @@ import hashlib
+ import sys
+ import os.path
+ import json
++import os
+
+ class Repo:
+ """A simple git repository HEAD commit info class
+@@ -437,15 +438,15 @@ string given.
+ OUTFILENAME = args.outfile,
+ ORIGIN = r.origin("local repository or using build servers"),
+ HASH = r.hash(),
+- HASH8 = r.hash(8),
++ HASH8 = os.environ['HASH8'],
+ TAG = r.tag(''),
+- TAG_OR_BRANCH = r.tag(r.branch('unreleased')),
++ TAG_OR_BRANCH = os.environ['TAGVERS'],
+ TAG_OR_HASH8 = r.tag(r.hash(8, 'untagged')),
+ LABEL = r.label(),
+ REVISION = r.revision(),
+ DIRTY = r.dirty(),
+- FWTAG = xtrim(r.tag(r.branch('unreleased')), r.dirty(), 25),
+- UNIXTIME = r.time(),
++ FWTAG = os.environ['TAGVERS'],
++ UNIXTIME = os.environ['UNIXTIME'],
+ DATE = r.time('%Y%m%d'),
+ DATETIME = r.time('%Y%m%d %H:%M'),
+ DAY = r.time('%d'),
diff --git a/debian/patches/series b/debian/patches/series
index 9d5c20e..c95d71d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
30_use_system_libs.patch
40_use_system_buildflags.patch
0001-Update-openpilot.desktop.patch
+50_set_tag.patch
diff --git a/debian/rules b/debian/rules
index 74da908..3ffc0d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,15 @@ export QT_SELECT=5
%:
dh $@ --parallel
+
+upstream_version := $(shell dpkg-parsechangelog -S Version)
+isodate := $(shell dpkg-parsechangelog -S Date)
+unixdate := $(shell date -d '$(isodate)' +%s)
+
+export HASH8=00000000
+export UNIXTIME=${unixdate}
+export TAGVERS=${upstream_version}
+
override_dh_auto_build:
$(MAKE) all
cp $(CURDIR)/package/linux/45-openpilot-permissions.rules $(CURDIR)/debian/openpilot.udev
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openpilot.git
More information about the debian-science-commits
mailing list