Skip to content
Permalink
Browse files

update snapcraft to bionic (core18)

- add release notes for 1.1.01
- add readme for snap
- fix typo in qt.mk
- add snap temp fix for ppc64el and QT
- add new plugs
- cleanup snapcraft.yaml
- bumped version to master
- change to release false
- bump version to 1.1.99
- switch to devel grade
- minor snap related fixes

This commit is squashed commit to clean up
history on master.

Squashed commit of the following:

commit 912382484039dc268387743a60dd92e21d5f09de
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 23:46:03 2019 +0200

    snap - clean up comments and whitespace errors

commit ba18b18
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 23:26:10 2019 +0200

    snap - fix typo

commit 86a63e0
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 23:25:42 2019 +0200

    snap - readd capitalize by var

commit 444ebc2
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 23:23:42 2019 +0200

    snap - fix typo

commit 5edbd27
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 23:23:11 2019 +0200

    snap - fix if fi typo

commit b514216
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 23:22:43 2019 +0200

    snap - dont capitalize by var

commit 1f48e42
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 23:15:33 2019 +0200

    snap - add brackets to vars

commit cb415a5
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 23:06:39 2019 +0200

    snap - remove xcb and fontconfig from stage and readd working plugs, cleanup and make it more compact

commit e059ff5
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 23:02:27 2019 +0200

    depends - rename

commit 6d13992
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 21:40:01 2019 +0200

    snap - remove gsettings,     desktop: qt-testnet.desktop

commit 53acac0
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 20:33:47 2019 +0200

    snap - remove content

commit 834e621
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 20:31:46 2019 +0200

    snap - remove optical-drive

commit 3de00fe
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 19:55:16 2019 +0200

    snap - remove unity8 plug as it is restricted

commit 238962c
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 18:59:27 2019 +0200

    snap - use dummy instead of deamon for ppc64el

commit 10d5589
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 18:34:55 2019 +0200

    snap - access resources across snaps

    yes for snaps from same publisher, no otherwise

commit 8e4d100
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 18:33:18 2019 +0200

    snap - provides access to any GSettings item for current user

commit e14e26d
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 18:32:09 2019 +0200

    snap - access snaps providing the media-hub interface

commit 39f02c0
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 18:29:54 2019 +0200

    snap - read/write access to CD/DVD drives

    yes, unless drive can write

commit 385895e
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 18:28:22 2019 +0200

    snap - enable play and record sound

commit 9a03171
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 18:27:06 2019 +0200

    snap - prevent screen sleep, lock and screensave for QT

commit d543429
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 18:22:14 2019 +0200

    snap - share data with other unity 8 apps (experimental)

commit db24d6d
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 18:19:49 2019 +0200

    snap - allow access the NetworkingStatus service

commit 01bd3af
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 18:10:53 2019 +0200

    snap - cleanup comments, remove dektop-launch

commit a620f15
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 17:32:00 2019 +0200

    snap - definition for part 'desktop-qt5'

commit a7f4ad6
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 17:27:34 2019 +0200

    snap - add qts packages to stage and add environment var to QT

commit b6e917d
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 17:06:44 2019 +0200

    snap - readd qt5-desktop plugs and wayland support

commit 6f99bf7
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 16:51:50 2019 +0200

    snap - readd qt5-desktop

commit 15a4e68
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 16:03:24 2019 +0200

    snap - add environment vars

commit 188d023
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 11:37:07 2019 +0200

    snap - add desktop-qt5 stage packages

commit 215454d
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 11:18:17 2019 +0200

    snap - readd testnet and regtest qt

commit 6a022dd
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 11:10:07 2019 +0200

    snap - readd testnet and regtest qt

commit 291115d
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 10:59:27 2019 +0200

    snap - cleanup stage

commit d1d8251
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 10:55:49 2019 +0200

    snap - cleanup stage

commit 156a06b
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 10:50:52 2019 +0200

    snap - cleanup stage

commit ec71f7c
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 10:46:58 2019 +0200

    snap - remove mir

commit f5a5566
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 10:41:09 2019 +0200

    snap - remove freetype

commit 0fbe955
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 10:35:17 2019 +0200

    snap - remove ssl, rename qt to qt5

commit dee4c56
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 10:27:57 2019 +0200

    snap - remove libpng

commit 1b0d08d
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 10:24:35 2019 +0200

    snap - remove qt plugins

commit 82f95a3
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 10:18:54 2019 +0200

    snap - remove boost

commit cc4c1dd
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 10:15:04 2019 +0200

    snap - remove Qt5DBus

commit 3219067
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 10:04:28 2019 +0200

    snap - update stage packages

commit 0dfe6ff
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 08:57:02 2019 +0200

    snap - cleanup desktop qt

commit 16018ec
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 07:41:07 2019 +0200

    snap - remove desktop-launch

commit c548743
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 07:11:41 2019 +0200

    snap - remove desktop-qt5 part

commit 1bdb3b7
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 06:57:09 2019 +0200

    snap - install gcc/g++ 8 on bionic to buiöd-packages

commit 5ded5cd
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 06:39:36 2019 +0200

    snap - install gcc/g++ 8 on bionic

commit df69f5f
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 06:07:32 2019 +0200

    snap - use base core18

commit 38164aa
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 05:56:45 2019 +0200

    snap - remove non existing gcc/g++ 4.8

commit d4581b3
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 05:40:51 2019 +0200

    snap - update readme.md

commit f7f2e10
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 04:28:52 2019 +0200

    snap - readd fix for building on launchpad, fails on snapcraft

commit fb921e5
Author: observerdev <dev@obsr.org>
Date:   Wed Apr 10 01:05:54 2019 +0200

    snap - add additional stage packages

commit 51bf18c
Author: OBSERVER <43307485+observerdev@users.noreply.github.com>
Date:   Wed Apr 10 00:11:54 2019 +0200

    Set theme jekyll-theme-modernist

commit 3653afd
Author: observerdev <dev@obsr.org>
Date:   Tue Apr 9 23:33:49 2019 +0200

    snap - revert adding xcb

commit 46760d3
Author: observerdev <dev@obsr.org>
Date:   Tue Apr 9 22:16:29 2019 +0200

    snap - add platform plugin xcb

commit 2d4fcd4
Author: observerdev <dev@obsr.org>
Date:   Tue Apr 9 21:13:19 2019 +0200

    add release notes v1.1.01

commit 878adca
Author: observerdev <dev@obsr.org>
Date:   Tue Apr 9 21:08:58 2019 +0200

    bump version on master (edge) to x.x.99

    - update configure.ac, set version and release false
    - update snapcraft yaml, set version and grade to devel
    - update snap shortcuts with version info
  • Loading branch information...
observerdev committed Apr 10, 2019
1 parent 53a86c8 commit 9c12a88251ffae5bec7ca69bd29acf9b3f8480bd
@@ -1 +1 @@
theme: jekyll-theme-slate
theme: jekyll-theme-modernist
@@ -2,9 +2,9 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 1)
define(_CLIENT_VERSION_REVISION, 01)
define(_CLIENT_VERSION_REVISION, 99)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_CLIENT_VERSION_IS_RELEASE, false)
define(_COPYRIGHT_YEAR, 2018)
AC_INIT([Obsr Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[www.obsr.org],[obsr])
AC_CONFIG_SRCDIR([src/main.cpp])
@@ -102,11 +102,11 @@ $(package)_config_opts_linux += -system-freetype
$(package)_config_opts_linux += -no-feature-sessionmanager
$(package)_config_opts_linux += -fontconfig
$(package)_config_opts_linux += -no-opengl
$(package)_config_opts_arm_linux += -platform linux-g++ -xplatform ion-linux-g++
$(package)_config_opts_arm_linux += -platform linux-g++ -xplatform obsr-linux-g++
$(package)_config_opts_i686_linux = -xplatform linux-g++-32
$(package)_config_opts_x86_64_linux = -xplatform linux-g++-64
$(package)_config_opts_aarch64_linux = -xplatform linux-aarch64-gnu-g++
$(package)_config_opts_riscv64_linux = -platform linux-g++ -xplatform ion-linux-g++
$(package)_config_opts_riscv64_linux = -platform linux-g++ -xplatform obsr-linux-g++
$(package)_config_opts_s390x_linux += -platform linux-g++ -xplatform linux-g++-64
$(package)_config_opts_powerpc_linux += -platform linux-g++ -xplatform linux-g++-32
$(package)_config_opts_powerpc64le_linux += -platform linux-g++ -xplatform linux-g++-64
@@ -151,8 +151,8 @@ define $(package)_preprocess_cmds
cp -f qtbase/mkspecs/macx-clang/Info.plist.app qtbase/mkspecs/macx-clang-linux/ &&\
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
cp -r qtbase/mkspecs/linux-arm-gnueabi-g++ qtbase/mkspecs/ion-linux-g++ && \
sed -i.old "s/arm-linux-gnueabi-/$(host)-/g" qtbase/mkspecs/ion-linux-g++/qmake.conf && \
cp -r qtbase/mkspecs/linux-arm-gnueabi-g++ qtbase/mkspecs/obsr-linux-g++ && \
sed -i.old "s/arm-linux-gnueabi-/$(host)-/g" qtbase/mkspecs/obsr-linux-g++/qmake.conf && \
patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch &&\
patch -p1 -i $($(package)_patch_dir)/fix_configure_mac.patch &&\
patch -p1 -i $($(package)_patch_dir)/fix_no_printer.patch &&\
@@ -0,0 +1,108 @@
OBSR Core version *v1.1.01* is now available from: <https://github.com/observernet/obsr/releases/tag/v1.1.01>

This is a new major version release, including various bug fixes and performance improvements, as well as updated translations.

Please report bugs using the issue tracker at github: <https://github.com/observernet/obsr/issues>

- [How to Upgrade](#how-to-upgrade)
- [Compatibility](#compatibility)
- [Notable Changes](#notable-changes)
- [*v1.1.01* Change log](#v1101-change-log)
- [Credits](#credits)

How to Upgrade
==============

If you are running an older version, shut it down. Wait until it has completely shut down (which might take a few minutes for older versions), then run the installer (on Windows) or just copy over /Applications/OBSR-Qt (on Mac) or obsrd/obsr-qt (on Linux).

If you are using snap, run `snap refresh` and latest version of your channel will be installed


Compatibility
==============

OBSR Core is extensively tested on multiple operating systems using the Linux kernel, macOS 10.10+, and Windows 7 and later.

Microsoft ended support for Windows XP on [April 8th, 2014](https://www.microsoft.com/en-us/WindowsForBusiness/end-of-xp-support), No attempt is made to prevent installing or running the software on Windows XP, you can still do so at your own risk but be aware that there are known instabilities and issues. Please do not report issues about Windows XP to the issue tracker.

OBSR Core should also work on most other Unix-like systems but is not frequently tested on them.

Notable Changes
==============

- Fix a display bug about zOBSR mints
- add info to titlebar when zobsr is in maintainence
- minor bugfixes
- minor snap update
- fix crashing when staking for some clients

*v1.1.01* Change log
==============

Detailed release notes follow. This overview includes changes that affect behavior, not code moves, refactors and string updates. For convenience in locating the code changes and accompanying discussion, both the pull request and git merge commit are mentioned.

c58c36d update snapcraft.yaml's descriptions and comments, update snaps readme
ea6b126 snap - add README.md and update snapcraft.yaml
d0de588 release v1.1.01
f866e1d snap - remove faketime part as unrequired
825918f snap - use glibc 2.17 for s390x
3899161 snap - add s390x glib compatibility
93ca298 snap - arm linux, change form arch-gcc/g++ to gcc-4.8 and g++-4.8
d6f7fdc snap - remove popd and push
59dbf98 release version v1.1.01
ee1d38c snap - remove unexpected fi
96b4fcd snapcraft - use var in if call for arm and remove done
26137ea snap - minor fixes
d3cc415 snap - replace include paths with current archs
360430e snapcraft - use gcc5
6a01622 snapcraft - add autotools-dev
8ee517b snapcraft - fix type and test gcc-/g++-7
b65decc snapcraft - rever make options for depends
352af19 add build-essential to snapcraft.yaml
e84bedb snapcraft - remove additional options and add -j4 to config for a test
10d737c snapcraft -change extra includes config
2b69151 add clang to build packages
02e78a1 Fix snapcraft script
948ea25 snapcraft fix
de5dee2 snapcraft fix wrong var
504ae5b remove functions from snapcraft.yaml
69ff9fe change snapcrafts wrap folder
809f392 Merge pull request #34 from observernet/fix-snapcraft
aa1f42f add missing deps to snapcraft.yaml
08da6e5 Merge pull request #33 from observernet/maintenance
4d4da99 update manual pages
4ee7cb3 Merge pull request #32 from obsr-ckti/regtest-fix
ea1f572 initialize accumulator checkpoints for testnet
ec6ab2d update checkpoints for main and testnet
1a6d7b0 update depends/readme.md
96c301e update readme.md
7039a46 add accumulator checkpoints json file
8ffa7b7 remove blockstoinclude
299851f bump version to v1.1.01
d89e0c6 fix version in readme
74eff14 Fix a display bug about zOBSR mints
f14442d add info to titlebar when zobsr is in maintainence
40f7f81 update snapcraft to use gitian desctiptors routines
5ac762c maintenance, add source updates, squased commit
2a8fad5 fix issues before applying maintenance commits
6763be0 fix testblockvalidity - add if statement before
9053a6c Revert "Update with five more working tests"
cdcfb8d Update with five more working tests
96a48b1 Add in http test

Credits
==============

Thanks to everyone who directly contributed to this release:

- Akshay <akshaycm@hotmail.com>
- ckti <ckti@3re.io>
- OBSERVER <43307485+observerdev@users.noreply.github.com>
- observerdev <dev@obsr.org>
- obsr-project <42689327+obsr-project@users.noreply.github.com>
- warrows <warrows@gamer666.fr>
- furszy <5377650+furszy@users.noreply.github.com>
- Fuzzbawls <fuzzbawls@gmail.com>
- Mrs-X <Mrs-X@users.noreply.github.com>

As well as everyone that helped translating on [Transifex](https://www.transifex.com/observer/obsr/dashboard/), the QA team during Testing and the Node hosts supporting our Testnet.
@@ -51,12 +51,13 @@ There are 4 different channels:
`sudo snap install --candidate obsr`

### Install latest beta version:
_(this is always current beta release version, built from release tag or commit)_
_(this is launchpad version, built from master and auto built 4 times a day if there are any changes)_

`sudo snap install --beta obsr`

### Install latest edge version:
_(this is always current latest version built from latest commit on master)_
_(this is always current latest version built from latest commit on master)
_(on this branch platform, arm devices do not work, please use beta channel, as example on raspberrypi)_

`sudo snap install --edge obsr`

@@ -1,7 +1,8 @@
# Copyright (c) 2018-2019 The Ion developers
# Copyright (c) 2019 The OBSR developers
name: obsr
version: v1.1.01
base: core18
version: v1.1.99
summary: peer-to-peer network based digital currency
description: |
OBSR is an open source crypto-currency focused on fast private
@@ -19,117 +20,98 @@ description: |
- Decentralized blockchain voting utilizing Masternode technology to form a DAO. The blockchain will distribute monthly treasury funds based on successful proposals submitted by the community and voted on by the DAO.
Github: https://github.com/observernet/obsr/
grade: stable
grade: devel
confinement: strict
icon: share/pixmaps/bitcoin256.png
apps:
daemon:
command: obsrd
plugs: [network, network-bind, home, removable-media]
environment:
XDG_DATA_DIRS: $SNAP_USER_DATA:$SNAP/usr/share:$XDG_DATA_DIRS
daemon-testnet:
command: obsrd --testnet
plugs: [network, network-bind, home, removable-media]
plugs: [network, network-bind, network-status, home, removable-media]
environment:
XDG_DATA_DIRS: $SNAP_USER_DATA:$SNAP/usr/share:$XDG_DATA_DIRS
daemon-regtest:
command: obsrd --regtest
plugs: [network, network-bind, home, removable-media]
qt:
command: desktop-launch obsr-qt
plugs: [network, network-bind, unity7, unity8-calendar, unity8-contacts, desktop, desktop-legacy, wayland, x11, mir, opengl, home, removable-media]
command: obsr-qt
plugs: [network, network-bind, network-status, unity7, desktop, desktop-legacy, wayland, x11, mir, opengl, home, gsettings, removable-media, screen-inhibit-control, pulseaudio, media-hub]
desktop: qt.desktop
environment:
QT_XKB_CONFIG_ROOT: $SNAP_USER_DATA:$SNAP/usr/share:$QT_XKB_CONFIG_ROOT
qt-testnet:
command: desktop-launch obsr-qt --testnet
plugs: [network, network-bind, unity7, unity8-calendar, unity8-contacts, desktop, desktop-legacy, wayland, x11, mir, opengl, home, removable-media]
command: obsr-qt --testnet
plugs: [network, network-bind, network-status, unity7, desktop, desktop-legacy, wayland, x11, mir, opengl, home, gsettings, removable-media, screen-inhibit-control, pulseaudio, media-hub]
desktop: qt-testnet.desktop
environment:
QT_XKB_CONFIG_ROOT: $SNAP_USER_DATA:$SNAP/usr/share:$QT_XKB_CONFIG_ROOT
qt-regtest:
command: desktop-launch obsr-qt --regtest
plugs: [network, network-bind, unity7, unity8-calendar, unity8-contacts, desktop, desktop-legacy, wayland, x11, mir, opengl, home, removable-media]
command: obsr-qt --regtest
plugs: [network, network-bind, network-status, unity7, desktop, desktop-legacy, wayland, x11, mir, opengl, home, gsettings, removable-media, screen-inhibit-control, pulseaudio, media-hub]
desktop: qt-regtest.desktop
environment:
QT_XKB_CONFIG_ROOT: $SNAP_USER_DATA:$SNAP/usr/share:$QT_XKB_CONFIG_ROOT
cli:
command: obsr-cli
plugs: [network, network-bind, home]
cli-testnet:
command: obsr-cli --testnet
plugs: [network, network-bind, home]
cli-regtest:
command: obsr-cli --regtest
plugs: [network, network-bind, home]
plugs: [network, network-bind, home, removable-media]
tx:
command: obsr-tx
plugs: [home]
plugs: [home, removable-media]
test:
command: test_obsr
plugs: [home, removable-media]
parts:
obsr:
source: https://github.com/observernet/obsr
source-type: git
source-tag: v1.1.01
source-tag: master
plugin: nil
override-build: |
# print glib version
# s390x-linux-gnu, powerpc64le-linux-gnu, aarch64-linux-gnu, arm-linux-gnueabihf, x86_64-linux-gnu: (Ubuntu GLIBC 2.23-0ubuntu11) 2.23)
echo "GLIBC version:"
ldd --version
# Patch - Default home folder
## We don't want to copy the full blockchain every time that the snap is
## updated, but there's no way to define a default data dir in obsr-qt.
## Additionaly we fix funcs.mk
echo "apply patches:"
git apply $SNAPCRAFT_STAGE/default_data_dir.patch
git apply $SNAPCRAFT_STAGE/fix-bdb-tmp-folder.patch
## Patch - Fix Bug extracting sources without ownership
sed -i 's/tar --strip-components/tar --no-same-owner --strip-components/' $SNAPCRAFT_PART_BUILD/depends/funcs.mk
# Build Dependencies
echo "START BUILDING FOR $SNAPCRAFT_ARCH_TRIPLET architecture"
cd $SNAPCRAFT_PART_BUILD/depends
# Fix building ARM and AARCH64, as on some point they fail with, predownload all packages
# curl: (22) The requested URL returned error: 407
make download-linux
if [ $SNAPCRAFT_ARCH_TRIPLET = "i386-linux-gnu" ]
then
make HOST=i686-linux-gnu
#elif [ $SNAPCRAFT_ARCH_TRIPLET = "arm-linux-gnueabihf" ]
#then
# update-alternatives --install /usr/bin/arm-linux-gnueabihf-gcc \
# arm-linux-gnueabihf-gcc /usr/bin/arm-linux-gnueabihf-gcc-4.8 100
# update-alternatives --install /usr/bin/arm-linux-gnueabihf-g++ \
# arm-linux-gnueabihf-g++ /usr/bin/arm-linux-gnueabihf-g++-4.8 100
# make HOST=$SNAPCRAFT_ARCH_TRIPLET -j4
LONGNAME="Observer Core"
SHORTNAME="obsr"
SHORTNAMECAPS="OBSR"
if [ $SNAPCRAFT_ARCH_TRIPLET = "i386-linux-gnu" ]; then
HOST="i686-linux-gnu"
else
make HOST=$SNAPCRAFT_ARCH_TRIPLET -j4
HOST="${SNAPCRAFT_ARCH_TRIPLET}"
fi
# Configure Observer Core
cd $SNAPCRAFT_PART_BUILD
echo "Configure and build OBSR"
# APPLY PATCHES
echo "apply patches:"
git apply ${SNAPCRAFT_STAGE}/default_data_dir.patch
git apply ${SNAPCRAFT_STAGE}/fix-bdb-tmp-folder.patch
sed -i 's/tar --strip-components/tar --no-same-owner --strip-components/' ${SNAPCRAFT_PART_BUILD}/depends/funcs.mk
# BUILD DEPENDENCIES
echo "START BUILDING ${LONGNAME} FOR ${SNAPCRAFT_ARCH_TRIPLET} architecture"
cd ${SNAPCRAFT_PART_BUILD}/depends
make download-linux
make -j4 HOST=${HOST}
# CONFIGURE
echo "Configure ${LONGNAME}"
cd ${SNAPCRAFT_PART_BUILD}
echo "Configure and build ${SHORTNAMECAPS}"
./autogen.sh
if [ $SNAPCRAFT_ARCH_TRIPLET = "i386-linux-gnu" ]
then
./configure --prefix=`pwd`/depends/i686-linux-gnu
else
./configure --prefix=`pwd`/depends/$SNAPCRAFT_ARCH_TRIPLET
fi
# Compile Observer Core
./configure --prefix=`pwd`/depends/${HOST}
# COMPILE
echo "Compile ${LONGNAME}"
make -j4
# strip symbols
BINARIES="obsrd obsr-cli obsr-tx qt/obsr-qt test/test_obsr"
for b in $BINARIES; do
if [ -e src/${b} ]; then
echo "Strip binary src/${b}"
strip src/${b}
# INSTALL
echo "Install ${LONGNAME}"
make install prefix=${SNAPCRAFT_PART_INSTALL}
# POST INSTALL
if [ $SNAPCRAFT_ARCH_TRIPLET = "powerpc64le-linux-gnu" ]; then
if [ -e $SNAPCRAFT_PART_BUILD/src/qt/${SHORTNAME}-qt ]; then
echo "PPC64EL fix - ${SHORTNAME}-qt exists, fix unrequired"
else
echo "echo ${SHORTNAME}-qt is not installed" > ${SNAPCRAFT_PART_INSTALL}/usr/bin/${SHORTNAME}-qt
chmod +x ${SNAPCRAFT_PART_INSTALL}/usr/bin/${SHORTNAME}-qt
echo "PPC64EL fix - ${SHORTNAME}-qt exists, fix required, dummy as ${SHORTNAME}-qt"
fi
done
# Install Observer Core
make install prefix=$SNAPCRAFT_PART_INSTALL
# print in log which files are installed
fi
echo "Installed files:"
find $SNAPCRAFT_PART_INSTALL -type f
find ${SNAPCRAFT_PART_INSTALL} -type f
build-packages:
- curl
- wget
- g++
- gcc
- gcc-8
- g++
- g++-8
- make
- autoconf
- automake
@@ -139,11 +121,6 @@ parts:
- bsdmainutils
- binutils
- python3
stage-packages: [ca-certificates]
after:
- desktop-qt5
- patches
desktop-qt5:
stage-packages:
- libxkbcommon0
- ttf-ubuntu-font-family
@@ -155,6 +132,9 @@ parts:
- libqt5svg5 # for loading icon themes which are svg
- locales-all
- qtwayland5
- ca-certificates
after:
- patches
patches:
source: snap/patches
plugin: dump
@@ -2,7 +2,7 @@

[Desktop Entry]
Type=Application
Version=1.1.01
Version=1.1.99
Encoding=UTF-8
Name=OBServer QT Regtest
Icon=${SNAP}/qt-regtest.ico
@@ -2,7 +2,7 @@

[Desktop Entry]
Type=Application
Version=1.1.01
Version=1.1.99
Encoding=UTF-8
Name=OBServer QT Testnet
Icon=${SNAP}/qt-testnet.ico

0 comments on commit 9c12a88

Please sign in to comment.
You can’t perform that action at this time.