Updated package & install configuration

- Added package changelog files for deb & rpm
- Added license file for deb pkg
- Added rules file for deb pkg
- Changed install subdirectory
pull/960/head
nightwalker-87 2020-05-18 15:13:36 +02:00
rodzic e3aa887f7f
commit 97d3173f48
9 zmienionych plików z 81 dodań i 243 usunięć

Wyświetl plik

@ -12,17 +12,17 @@ if [ "$TRAVIS_JOB_NAME" == "linux-mingw" ]; then
echo "--> Building Release for Windows (x86-64) ..."
mkdir -p build-mingw && cd build-mingw
echo "-DCMAKE_SYSTEM_NAME=Windows -DTOOLCHAIN_PREFIX=x86_64-w64-mingw32 \
-DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/_install $DIR"
-DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR"
cmake -DCMAKE_SYSTEM_NAME=Windows -DTOOLCHAIN_PREFIX=x86_64-w64-mingw32 \
-DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/_install $DIR
-DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR
make && rm -rf build-mingw && cd -
echo "--> Building Release for Windows (i686) ..."
mkdir -p build-mingw && cd build-mingw
echo "-DCMAKE_SYSTEM_NAME=Windows -DTOOLCHAIN_PREFIX=i686-w64-mingw32 \
-DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/_install $DIR"
-DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR"
cmake -DCMAKE_SYSTEM_NAME=Windows -DTOOLCHAIN_PREFIX=i686-w64-mingw32 \
-DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/_install $DIR
-DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR
make && rm -rf build-mingw && cd -
elif [ "$TRAVIS_OS_NAME" == "linux" ]; then
@ -31,14 +31,14 @@ elif [ "$TRAVIS_OS_NAME" == "linux" ]; then
echo "--> Building Debug..."
mkdir -p build/Debug && cd build/Debug
echo "-DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/_install"
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/_install $DIR
echo "-DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/install"
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR
make && make package && cd -
echo "--> Building Release..."
mkdir -p build/Release && cd build/Release
echo "-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/_install"
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/_install $DIR
echo "-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/install"
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR
make && make package && cd -
elif [ "$TRAVIS_OS_NAME" == "osx" ]; then
@ -46,26 +46,26 @@ elif [ "$TRAVIS_OS_NAME" == "osx" ]; then
echo "--> Building Debug..."
mkdir -p build/Debug && cd build/Debug
echo "-DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/_install"
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/_install $DIR
echo "-DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/install"
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR
make && make package && cd -
echo "--> Building Release..."
mkdir -p build/Release && cd build/Release
echo "-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/_install"
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/_install $DIR
echo "-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/install"
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR
make && make package && cd -
else # local test-build
echo "--> Building Debug..."
mkdir -p build/Debug && cd build/Debug
echo "-DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/_install"
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/_install ../../
echo "-DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/install"
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/install ../../
make && make package && cd -
echo "--> Building Release..."
mkdir -p build/Release && cd build/Release
echo "-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/_install"
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/_install ../../
echo "-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/install"
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/install ../../
make && make package && cd -
fi

Wyświetl plik

@ -67,7 +67,7 @@ find_package(libusb REQUIRED)
## Package configuration (pkg-config) on unix-based systems
if (NOT WIN32 AND NOT CMAKE_CROSSCOMPILING)
add_subdirectory(cmake/pkgconfig)
#add_subdirectory(cmake/pkgconfig)
find_package(PkgConfig)
pkg_check_modules(GTK3 gtk+-3.0)
endif ()
@ -187,7 +187,7 @@ set_target_properties(
)
# Link shared library
if (APPLE) # ... with Apple macOS libraries
if (APPLE) # ... with Apple macOS libraries
find_library(ObjC objc)
find_library(CoreFoundation CoreFoundation)
find_library(IOKit IOKit)
@ -230,7 +230,7 @@ set_target_properties(
)
# Link static library
if (APPLE) # ... with Apple macOS libraries
if (APPLE) # ... with Apple macOS libraries
find_library(ObjC objc)
find_library(CoreFoundation CoreFoundation)
find_library(IOKit IOKit)

Wyświetl plik

@ -62,20 +62,23 @@ elseif (EXISTS "/etc/debian_version" AND NOT EXISTS WIN32) # Package-build is av
# CPACK_DEBIAN_PACKAGE_HOMEPAGE --> Default: CMAKE_PROJECT_HOMEPAGE_URL
set(CPACK_DEBIAN_PACKAGE_SUGGESTS "libgtk-3-dev, pandoc")
## Add CHANGELOG in Debian-specific format
### TODO
## Add license file
### TODO
# Include a postinst-script
set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/cmake/packaging/debian/postinst")
## Additional package files in Debian-specific format:
# * changelog (package changelog)
# * copyright (license file)
# * rules
# * postinst-script
set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
"${CMAKE_SOURCE_DIR}/cmake/packaging/deb/changelog"
"${CMAKE_SOURCE_DIR}/cmake/packaging/deb/copyright"
"${CMAKE_SOURCE_DIR}/cmake/packaging/deb/rules"
"${CMAKE_SOURCE_DIR}/cmake/packaging/deb/postinst"
)
###
# Slackware & Redhat (RPM)
###
set(CPACK_SET_DESTDIR "OFF")
set(CPACK_SET_DESTDIR "OFF") # Required for relocatable package
# CPACK_RPM_PACKAGE_SUMMARY --> Default: CPACK_PACKAGE_DESCRIPTION_SUMMARY
# CPACK_RPM_PACKAGE_NAME --> Default: CPACK_PACKAGE_NAME
@ -97,8 +100,9 @@ elseif (EXISTS "/etc/debian_version" AND NOT EXISTS WIN32) # Package-build is av
# CPACK_RPM_PACKAGE_URL --> Default: CMAKE_PROJECT_HOMEPAGE_URL
set(CPACK_RPM_PACKAGE_DESCRIPTION CPACK_DEBIAN_PACKAGE_DESCRIPTION)
## Add CHANGELOG in rpm-specific format
### TODO
## Add package changelog in rpm-specific format
set(CPACK_RPM_CHANGELOG_FILE "${CMAKE_SOURCE_DIR}/cmake/packaging/rpm/changelog")
else ()
# No package configuration on other platforms ...
endif ()

Wyświetl plik

@ -1,226 +1,49 @@
stlink (1.6.0) unstable; urgency=medium
stlink (1.6.0+ds-1) unstable; urgency=medium
Release date: 2020-02-20
* Merge tag 'v1.6.0' into debian
* Bump Standards-Version to 4.5.0, no changes.
* Update libstlink1 symbols file for 1.6.0.
Major changes and added features:
-- Luca Boccassi <bluca@debian.org> Tue, 25 Feb 2020 22:08:33 +0000
* Initial support for STM32L41X
* Working support for CKS32F103C8T6 and related CKS devices with Core-ID 0x2ba01477
* Added preliminary support for some STM32G0 chips
* Added support for mass erasing second bank on STM32F10x_XL
* Added call to clear PG bit after writing to flash
* Added support to write option bytes for the STM32G0
* Added support for STM32WB55 chips
* Added STLink V3SET VID:PIDs to the udev rules
* Support for "STM32+Audio" v2-1 firmware
* Build for Windows under Debian/Ubuntu
* Allow for 64 bytes serials
* Added full support for STLINK CHIP ID L4RX
* Added support for the STLink-v2.1 when flashed with no mass storage (PID 0x3752)
* Added support for writing option bytes on STM32L0xx
* Added support to read and write option bytes for STM32F2 series
* Added support to read and write option bytes for STM32F446
stlink (1.5.1+ds-2) unstable; urgency=medium
Updates and fixes:
* Mark library packages as Multi-Arch: same.
* Apply cross.patch to fix cross-compiling the GUI. Thanks Helmut for the patch! (Closes: #941320)
* Vcs-Git: add -b debian
* Set Rules-Requires-Root: no
* Bump Standards-Version to 4.4.0
* Fixed "unkown chip id", piped output and st-util -v
* Fixed an issue with versioning stuck at 1.4.0 for versions cloned with git
* Updated STM32F3xx chip ID that covers a few different devices
* Made udev rules and modprobe conf installation optional
* Fixed case when __FILE__ don't contain "/" nor "\\"
* Fixed double dash issue in doc/man
* Compiling documentation: package is called libusb-1.0-0-dev on Debian
* Only do bank calculation on STM32L4 devices with dual banked flash / Added chip-ID 0x464 for STM32L41xxx/L42xxx devices
* Added O_BINARY option to open file
* Fixed versioning when compiling from the checked out git-repo
* win32: move usleep definition to unistd.h
* Fixed relative path to the UI files needed by stlink-gui-local (GUI)
* Added howto for sending NRST signal through GDB
* Fixed package name "devscripts" in doc/compiling.md
* Fixed few potential memory/resource leaks
* Updated Linux source repositories in README.md: Debian and Ubuntu
* Do not issue JTAG reset on stlink-v1
* Fixed flash size of STM32 Discovery vl
* Updated documentation on software structure
-- Luca Boccassi <bluca@debian.org> Sun, 29 Sep 2019 12:50:58 +0100
General project updates:
stlink (1.5.1+ds-1) unstable; urgency=medium
* Updated README.md, CHANGELOG.md and issue templates
* Fixed travis build config file
* Added CODE_OF_CONDUCT
* Archived page from github project wiki to doc/wiki_old.md
* Merge tag 'v1.5.1' into debian. See upstream changelog for info:
https://github.com/stlink-org/stlink/releases/tag/v1.5.1
* Mark packages as linux-any, other systems not supported.
-- Luca Boccassi <bluca@debian.org> Tue, 25 Feb 2020 22:08:33 +0000
-- Luca Boccassi <bluca@debian.org> Fri, 28 Sep 2018 10:26:39 +0100
stlink (1.5.0+ds-1) unstable; urgency=medium
stlink (1.5.1) unstable; urgency=medium
Release date: 2018-09-13
Major changes and added features:
* Added reset through AIRCR
* Added creation of icons for .desktop file
* Added desktop file for linux
* Added button to export STM32 flash memory to a file
* Updated libusb to 1.0.22
* Added icons for STLink GUI
* Added support for STM32L4R9 target
* Added memory map for STM32F411RE target
* Implemented intel hex support for GTK GUI
Updates and fixes:
* Fixed missing flash_loader for STM32L0x
* Fix for stlink library calls exit() or _exit()
* Added semihosting parameter documentation in doc/man
* Fixed reference to non-exisiting st-term tool in doc/man
* Fixed serial number size mismatch with stlink_open_usb()
* Debian packaging, CMake and README.md fixes
* Disabled static library installation by default
* Fix for libusb deprecation
* Renamed STLINK_CHIPID_STM32_L4R9 to STLINK_CHIPID_STM32_L4RX
* Regression: stlink installation under Linux (Debian 9) is broken since #695
* Fixed flash memory map for STM32F72xxx target
* Proper flash page size calculation for STM32F412xx target
* Return correct value on EOF for Semihosting SYS_READ
* FreeBSD defines LIBUSB_API_VERSION instead of LIBUSBX_API_VERSION
-- Luca Boccassi <bluca@debian.org> Fri, 28 Sep 2018 10:26:39 +0100
stlink (1.5.0) unstable; urgency=medium
Release date: 2018-02-16
Major changes and added features:
* Added support of STM32L496xx/4A6xx devices
* Added unknown chip dummy to obtain the serial of the ST-link by a call to st-info --probe
* Added support for STM32F72xx (chip-ID: 0x452) devices
Updates and fixes:
* Fixed verification of flash error for STM32L496x device
* Updated Linux source repositories in README.md: Gentoo, Fedora and RedHat/CentOS
* Updated changelog in debian package
* Added LIB_INSTALL_DIR to correct libs install on 64-bit systems
* Fixed write for microcontroller with RAM size less or equal to 32K
* Fixed memory map for STM32L496xx boards
* Fixed __FILE__ base name extraction
* Added debian/triggers to run ldconfig
* Fixed build on Fedora with GCC 8
-- Luca Boccassi <bluca@debian.org> Fri, 16 Mar 2018 16:56:17 +0000
* Upload to unstable. (Closes: #869421)
-- Luca Boccassi <bluca@debian.org> Fri, 16 Mar 2018 16:56:17 +0000
stlink (1.4.0) unstable; urgency=low
Release date: 2017-07-01
Major changes and added features:
* Allow building of debian package with CPack
* Added support for STM32L011 target
* Added support for flashing second bank on STM32F10x_XL
* Initial support to compile with Microsoft Visual Studio 2017
* Added support for STM32L452 target
Updates and fixes:
* Fixed gdb-server: STM32L0xx has no FP_CTRL register for breakpoints
* Added --flash=n[k][m] command line option to override device model
* Updated libusb to 1.0.21 for Windows
* Fixed low-voltage flashing on STM32F7 devices
* Fixed building with mingw64
* Fixed possible memory leak
* Fixed installation path for shared objects
* Fixed a few -Wformat warnings
* Removed unused defines in mimgw.h
* Skip GTK detection when cross-compiling
* Fixed compilation with GCC 7
* Fixed flashing to 'f0 device' targets
* Fixed wrong counting when flashing
-- Andrew 'Necromant' Andrianov <andrew@ncrmnt.org> Sat, 01 Jul 2017 00:00:00 +0000
-- Andrew 'Necromant' Andrianov <andrew@ncrmnt.org> Sat, 01 Jul 2017 00:00:00 +0000
stlink (1.3.1) unstable; urgency=low
Release date: 2017-02-25
Major changes and added features:
* Added support for Semihosting `SYS_READC`
* Added support for STM32F413
* Added preliminary support for STM32L011 to see it after probe (chip-ID 0x457)
Updates and fixes:
* cmake/CPackConfig.cmake: Fixup OSX zip filename
* Updated source repositories in README.md: Windows, macOS, Alpine Linux
* Compilation fixes
* Stripped full paths to source files in log
* Fixed incorrect release folder name in docs
* Fixed compilation when path includes spaces
-- Andrew 'Necromant' Andrianov <andrew@ncrmnt.org> Sat, 25 Feb 2017 00:00:00 +0000
-- Andrew 'Necromant' Andrianov <andrew@ncrmnt.org> Sat, 25 Feb 2017 00:00:00 +0000
stlink (1.3.0) unstable; urgency=low
Release date: 2017-01-28
-- Andrew 'Necromant' Andrianov <andrew@ncrmnt.org> Sat, 28 Jan 2017 00:00:00 +0000
Major changes and added features:
stlink (1.2.1) unstable; urgency=low
* Deprecation of autotools (autoconf, automake) and fixed build with MinGW
* Added intel hex file reading for `st-flash`
* Added support for ARM semihosting to `st-util`
* Added manpages (generated with pandoc from Markdown)
* Removal of undocumented `st-term` utility, which is now replaced by `st-util` ARM semihosting feature
* Support serial numbers argument for `st-util` and `st-flash` to probe and control multiple connected programmers
* Merge st-probe tool into st-info
* Added support for native debian packaging
* Rewritten commandline parsing for `st-flash`
* Added `--reset` command to `st-flash`
* st-util should detect when USB commands fail
* Initial Debian-Packaged Release.
Chip support added for:
* STM32F401XE: Added memory map for device
* STM32F410RBTx
* STM32F412
* STM32F7xx
* STM32F7x7x
* STM32L0xx Cat2 devices (chip-ID: 0x425)
* STM32L0xx Cat5 devices (chip-ID: 0x447)
* STM32L4xx
* STM32L432
Updates and fixes:
* Fixed "unaligned addr or size" when trying to write a program in RAM
* Fixed flashing on STM32_F3_SMALL
* Fixed STM32L-problem with flash loader
* Don't read the target voltage on startup, because it crashes STM32F100
* Added a useful error message instead of "[!] send_recv"
* Do a JTAG reset prior to reading CPU information when processor is in deep sleep
* Fixed STM32F030 erase error
* Fixed memory map for STM32F7xx
* Redesign of `st-flash` commandline options parsing
* Set SWDCLK and fixed jtag_reset bug
* doc/compiling.md: Add note about installation and ldconfig
* Fixed Release target to generate the man-pages with pandoc
* Fixed Cygwin build
* Reset flash mass erase (MER) bit after mass erase for safety
* Wrong extract command in FindLibUSB.cmake
* Fixed compilation error on Ubuntu 16.10
-- Andrew 'Necromant' Andrianov <andrew@ncrmnt.org> Sat, 28 Jan 2017 00:00:00 +0000
libstlink (1.2.1) unstable; urgency=low
* Initial Debian-packaged release.
-- Andrew 'Necromant' Andrianov <andrew@ncrmnt.org> Sat, 09 Jul 2016 23:16:07 +0300
-- Andrew 'Necromant' Andrianov <andrew@ncrmnt.org> Sat, 09 Jul 2016 23:16:07 +0300

Wyświetl plik

@ -0,0 +1,9 @@
Source: stlink
Maintainer: Luca Bocassi <bluca@debian.org>
Build-Depends: cmake, dh-cmake, debhelper (>= 9), libusb-1.0-0-dev, libgtk-3-dev
Standards-Version: 4.1.3
Section: electronics
Priority: optional
Homepage: https://github.com/stlink-org/stlink
Vcs-Git: https://github.com/stlink-org/stlink.git
Vcs-Browser: https://github.com/stlink-org/stlink

Wyświetl plik

@ -4,6 +4,14 @@ Upstream-Contact: Luca Bocassi <bluca@debian.org>
Source: https://github.com/stlink-org/stlink
Disclaimer:
Comment:
Files: *
Copyright: 2011-2020 stlink-org
Martin Capitanio [capnm]
Fabien Le Mentec [texane]
Jerry Jacobs [xor-gate]
[Nightwalker-87]
and many others...
A list of contributors can be found in "contributors.txt".
License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
@ -27,11 +35,3 @@ License: BSD-3-clause
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Files: *
Copyright: 2011-2020 stlink-org
Martin Capitanio [capnm]
Fabien Le Mentec [texane]
Jerry Jacobs [xor-gate]
[Nightwalker-87]
.
and many others... A list of contributors can be found in "contributors.txt".

Wyświetl plik

@ -11,7 +11,7 @@ include /usr/share/dpkg/default.mk
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:
dh $@ --buildsystem cmake
dh $@ --buildsystem cmake --with cpack
override_dh_auto_configure:
dh_auto_configure -- \

Wyświetl plik

@ -0,0 +1,2 @@
* Mon Jun 01 2020 Vasiliy Glazov <vascom@fedoraproject.org> - 1.6.1
- Initial RPM-packaged release

Wyświetl plik

@ -5,5 +5,5 @@ cd build-mingw
set PATH=C:\Program Files (x86)\CMake\bin;C:\Program Files\CMake\bin;C:\Program Files\mingw-w64\x86_64-8.1.0-win32-sjlj-rt_v6-rev0\mingw64\bin;%PATH%
cmake -G "MinGW Makefiles" ..
mingw32-make
mingw32-make install DESTDIR=_install
mingw32-make install DESTDIR=install
mingw32-make package