Commit 75d623ab authored by Rafael Monnerat's avatar Rafael Monnerat

obs/slapos: Update to new debian format

parent 18f44e55
......@@ -5,82 +5,5 @@
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
# This is the debhelper compatibility version to use.
export DH_COMPAT=4
CFLAGS = -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
build: build-stamp
build-stamp:
dh_testdir
# Add here commands to compile the package.
make
# --- end custom part for compiling
touch build-stamp
clean:
dh_testdir
dh_testroot
rm -f build-stamp
# Add here commands to clean up after the build process
# --- end custom part for cleaning up
dh_clean
install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
# Add here commands to install the package
# The DESTDIR Has To Be Exactly /usr/src/packages/BUILD/debian/<nameOfPackage>
dh_auto_install --TARGET_DIRECTORY=/opt/slapos
# --- end custom part for installing
# Build architecture-independent files here.
binary-indep: build install
# We have nothing to do by default.
# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
dh_testroot
# dh_installdebconf
dh_installdocs
dh_installexamples
dh_installmenu
# dh_installlogrotate
# dh_installemacsen
# dh_installpam
# dh_installmime
dh_installinit
dh_installcron
dh_installlogrotate
dh_installman
dh_installinfo
# dh_undocumented
dh_installchangelogs
dh_link
dh_strip
dh_compress
dh_fixperms
dh_makeshlibs -n
dh_installdeb
# dh_perl
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb -- -Zlzma -z9
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
\ No newline at end of file
%:
dh $@ --with python2
  • This is a little too minimalistic. DH_COMPAT=4 is removed but there's no debian/compat, which explains why OBS transforms the package to add 1, with a value that does not make sense: debhelper would be free to fail because version 5 does not support the new %: dh $@. Also in debian/control, the debhelper version dep is usually updated accordingly, or simply removed because we don't plan to use recent features. Suggested change:

    diff --git a/obs/slapos/debian/compat b/obs/slapos/debian/compat
    new file mode 100644
    index 0000000..45a4fb7
    --- /dev/null
    +++ b/obs/slapos/debian/compat
    @@ -0,0 +1 @@
    +8
    diff --git a/obs/slapos/debian/control b/obs/slapos/debian/control
    index 5e6af3d..218323d 100644
    --- a/obs/slapos/debian/control
    +++ b/obs/slapos/debian/control
    @@ -2,7 +2,7 @@ Source: slapos-node
     Maintainer: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
     Section: net
     Priority: optional
    -Build-Depends: debhelper (>= 4.1.16),
    +Build-Depends: debhelper,
                    chrpath,
                    po-debconf,
                    wget,

    obs/re6st/debian/rules contains parts that also apply here. At least everything related to shlibs. Actually, the old packaging already had dh_makeshlibs -n.

Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment