endif
if ENABLE_RPM_BUILD
-build_rpm:
+rpm-pkg:
rpmbuild --nodeps --nocheck -bb rpm/sdl.spec --define="_sourcedir $(top_srcdir)" --define="_builddir $(top_srcdir)" --define="_rpmdir .."
mkdir -p @RPM_DIR@
cp ../x86_64/*.rpm @RPM_DIR@
if ENABLE_DEB_BUILD
-build_deb:
+deb-pkg:
DEB_BUILD_OPTIONS='nocheck noddebs' debuild -b -us -uc
mkdir -p @DEB_DIR@
cp ../*.deb @DEB_DIR@
gawk \
debhelper \
autoconf-archive \
- libboost-all-dev \
- libhiredis-dev && \
+ libboost-filesystem-dev \
+ libboost-program-options-dev \
+ libboost-system-dev \
+ libhiredis-dev \
+ valgrind && \
apt-get clean
# Copy sourcefiles:
# Build packages:
RUN make clean && \
make distclean && \
- ./package.sh --skip-test debian rpm
+ ./configure --with-rpm-dir=/tmp/pkgs && \
+ make rpm-pkg && \
+ make clean && \
+ make distclean && \
+ ./configure --with-deb-dir=/tmp/pkgs && \
+ make deb-pkg
RUN cp /tmp/build/ci/publish.sh /bin
ENTRYPOINT ["/bin/publish.sh"]
exit 1
fi
-cp -v /tmp/*.rpm /tmp/*.deb "$TARGET"
+cp -v /tmp/pkgs/*.rpm /tmp/pkgs/*.deb "$TARGET"
m4_define([SDL_MAJOR], [1])
m4_define([SDL_MINOR], [1])
-m4_define([SDL_MICRO], [2])
+m4_define([SDL_MICRO], [3])
# SDL ABI version with libtool
#
# Change the numbers just before release.
m4_define([SDL_CURRENT], [2])
-m4_define([SDL_REVISION], [6])
+m4_define([SDL_REVISION], [7])
m4_define([SDL_AGE], [1])
AC_INIT([shareddatalayer], [SDL_MAJOR.SDL_MINOR.SDL_MICRO], [], [], [https://gerrit.o-ran-sc.org/r/admin/repos/ric-plt/sdl])
+sdl (1.1.3-1) UNRELEASED; urgency=low
+
+ * Rename rpm and Debian makefile targets to rpm-pkg and deb-pkg.
+ * Update CI Dockerfile to utilize rpm-pkg and deb-pkg makefile targets.
+
+ -- Timo Tietavainen <timo.tietavainen@nokia.com> Sat, 16 May 2020 12:25:59 +0300
+
sdl (1.1.2-1) UNRELEASED; urgency=low
* Add makefile targets to build rpm and Debian packages.
Version history
---------------
+[1.1.3] - 2020-05-16
+
+* Rename rpm and Debian makefile targets to rpm-pkg and deb-pkg.
+* Update CI Dockerfile to utilize rpm-pkg and deb-pkg makefile targets.
+
[1.1.2] - 2020-05-15
* Add makefile targets to build rpm and Debian packages.
Name: sdl
-Version: 1.1.2
+Version: 1.1.3
Release: 1%{?dist}
Summary: C++ API library for Shared Data Layer clients
%{_includedir}/sdl
%changelog
+* Sat May 16 2020 Timo Tietavainen <timo.tietavainen@nokia.com> - 1.1.3-1
+- Rename rpm and Debian makefile targets to rpm-pkg and deb-pkg.
+- Update CI Dockerfile to utilize rpm-pkg and deb-pkg makefile targets.
+
* Fri May 15 2020 Timo Tietavainen <timo.tietavainen@nokia.com> - 1.1.2-1
- Add makefile targets to build rpm and Debian packages.