Skip to content

Commit

Permalink
Fedora 26 build scripts and spec files
Browse files Browse the repository at this point in the history
  • Loading branch information
froller authored and Arne-W committed Jul 30, 2018
1 parent e3357d0 commit cb3a517
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 157 deletions.
8 changes: 5 additions & 3 deletions redhat/apmplanner2.spec
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,22 @@ BuildRequires: qt5-qtsvg-devel >= 5.2
BuildRequires: qt5-qtwebkit-devel >= 5.2
BuildRequires: SDL2-devel >= 2.0
BuildRequires: alsa-lib-devel
BuildRequires: flite-devel
#BuildRequires: flite-devel
BuildRequires: libsndfile-devel
BuildRequires: openssl-devel
BuildRequires: zlib-devel
URL: https://github.com/diydrones/apm_planner
URL: https://github.com/ardupilot/apm_planner
ExcludeArch: s390 s390x

%description

%global debug_package %{nil}

%prep
%autosetup

%build
qmake-qt5 CONFIG+=%{_arch} qgroundcontrol.pro PREFIX=$RPM_BUILD_ROOT%{_prefix}
qmake-qt5 CONFIG+=%{_arch} apm_planner.pro PREFIX=$RPM_BUILD_ROOT%{_prefix}

NCORES=`cat /proc/cpuinfo | grep ^processor | sort -r | head -n 1 | sed -e 's/^.\+\([0-9]\)\+.*/\1/'`
NPROCS=$(( ( $NCORES + 1 ) * 2 ));
Expand Down
53 changes: 0 additions & 53 deletions redhat/diydrones-repo.spec

This file was deleted.

32 changes: 0 additions & 32 deletions redhat/diydrones.repo

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/build_rpm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ then
SPEC_FILE="${HOME}/rpmbuild/SPECS/apmplanner2.spec"
fi

rpmbuild -ba $SPEC_FILE --target=i686
#rpmbuild -ba $SPEC_FILE --target=i686
rpmbuild -ba $SPEC_FILE --target=x86_64
68 changes: 0 additions & 68 deletions scripts/prepare_rpm.pl

This file was deleted.

46 changes: 46 additions & 0 deletions scripts/prepare_rpm.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
#!/bin/bash

LATEST_RELEASE="2.0"

PROJECT_NAME="apmplanner2"
REPO_URL="ssh://[email protected]/ardupilot/apm_planner.git"

RPMBUILD_ROOT="${HOME}/rpmbuild"
PROJECT_FILE_NAME="apm_planner.pro"

if [[ -f "../${PROJECT_FILE_NAME}" ]]
then
WORK_PATH=".."
elif [[ -f "./${PROJECT_FILE_NAME}" ]]
then
WORK_PATH="."
else
WORK_PATH="apm_planner"
fi
WORK_PATH=$(realpath "$WORK_PATH")

if [[ -d "$WORK_PATH" && -d "${WORK_PATH}/.git" ]]
then
git -C "$WORK_PATH" pull
else
git clone "$REPO_URL" "$WORK_PATH"
fi

read -a V <<< $(git -C "$WORK_PATH" describe | sed "s/\-/ /")
VERSION="${V[0]}"
RELEASE=$(sed "s/\-/_/" <<< ${V[1]})

TARBALL_PATH="${RPMBUILD_ROOT}/SOURCES/${PROJECT_NAME}-${VERSION}.tar.gz"
rm -f "$TARBALL_PATH"
echo -n "Packing source tarball $TARBALL_PATH ... "
WPREGEX=$(sed "s/^\///" <<< $WORK_PATH)
tar --exclude-vcs --exclude=Drivers --exclude=avrdude --exclude=uploader --xform=s%^${WPREGEX}%${PROJECT_NAME}-${VERSION}/% -z -c -f ${TARBALL_PATH} ${WORK_PATH}
echo "done"

OLD_SPEC="${WORK_PATH}/redhat/apmplanner2.spec";
NEW_SPEC="${RPMBUILD_ROOT}/SPECS/${PROJECT_NAME}.spec";

echo -n "Writing ${PROJECT_NAME}.spec ... "
sed -e "s/\(Version:\s\+\).\+/\1${VERSION}/; s/\(Release:\s\+\).\+/\1${RELEASE}/" < $OLD_SPEC > $NEW_SPEC
echo "done"

0 comments on commit cb3a517

Please sign in to comment.