Skip to content

Commit

Permalink
Debian only:
Browse files Browse the repository at this point in the history
Correcting and tricking unibuild-order for s3-benchmark build.
(the test and tool plugins build will need to be corrected subsequently)
Adding missing descriptions body.
Not building dbgsym iperf3 package.
  • Loading branch information
laeti-tia committed Apr 16, 2024
1 parent c8340e9 commit fa61c40
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 19 deletions.
4 changes: 4 additions & 0 deletions iperf/unibuild-packaging/deb/rules
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ override_dh_auto_configure:
%:
dh $@
override_dh_auto_test:

# dbgsym.ddeb are currently not supported by reprepro
override_dh_strip:
dh_strip --no-automatic-dbgsym
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# false positive, only debian/* is GPL
libiperf0: possible-gpl-code-linked-with-openssl
libiperf0-ssl3: possible-gpl-code-linked-with-openssl

Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ Architecture: all
Depends: ${misc:Depends}, python3, python3-pscheduler,
pscheduler-server (>= 1.0.2), python3-kafka
Description: Apache Kafka archiver class for pScheduler
Archiver sends test results to a Kafka bus
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ Architecture: all
Depends: ${misc:Depends}, python3, python3-pscheduler,
pscheduler-server
Description: postgresql archiver class for pScheduler
Archiver sends data to a PostgreSQL database.
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ Package: pscheduler-jq-library
Architecture: all
Depends: ${misc:Depends}, jq
Description: Library of JQ functions for pScheduler
A library of JQ functions to use pScheduler internals.
10 changes: 0 additions & 10 deletions python-pscheduler/pscheduler/debian/patches/python35

This file was deleted.

16 changes: 8 additions & 8 deletions unibuild-order
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,9 @@ changecom()dnl
define(INCLUDE_OWAMP_TOOLS,1)
define(OWAMP_TOOL,ifelse(INCLUDE_OWAMP_TOOLS,1,$1,))

# Debian 9 (Stretch) doesn't support Golang sufficiently for what we
# need, nor is there support for it on arm64 or ppc64el.
define(HAVE_GOLANG,ifelse(FAMILY/eval(MAJOR < 10),Debian/1,,
FAMILY/ARCH,Debian/arm64,,
FAMILY/ARCH,Debian/ppc64el,,
# There is no Golang support on armhf or ppc64le.
define(HAVE_GOLANG,ifelse(FAMILY/ARCH,Debian/armv7,,
FAMILY/ARCH,Debian/ppc64le,,
1))


Expand Down Expand Up @@ -136,7 +134,7 @@ paris-traceroute
# Some Debian and all Ubuntus don't have a recent-enough Golang to
# build this.
define(HAVE_S3_BENCHMARK,ifelse(HAVE_GOLANG,0,0,
FAMILY/eval(MAJOR == 11),Debian/1,1,
FAMILY/eval(MAJOR == 11),Debian/1,HAVE_GOLANG,
FAMILY,Debian,,
1))
ifelse(HAVE_S3_BENCHMARK,1,s3-benchmark)
Expand Down Expand Up @@ -179,7 +177,8 @@ pscheduler-test-throughput
# This has not been released. See also pscheduler-tool-nmapscan
# pscheduler-test-openports --bundle extras
pscheduler-test-rtt
ifelse(HAVE_S3_BENCHMARK,1,pscheduler-test-s3throughput)
#ifelse(HAVE_S3_BENCHMARK,1,pscheduler-test-s3throughput)
pscheduler-test-s3throughput
pscheduler-test-simplestream
pscheduler-test-snmpget --bundle snmp
pscheduler-test-snmpgetbgm --bundle snmp
Expand Down Expand Up @@ -220,7 +219,8 @@ pscheduler-tool-psclock
pscheduler-tool-pstimer
pscheduler-tool-psurl --bundle obsolete
pscheduler-tool-pysnmp --bundle snmp
ifelse(HAVE_S3_BENCHMARK,1,pscheduler-tool-s3-benchmark)
#ifelse(HAVE_S3_BENCHMARK,1,pscheduler-tool-s3-benchmark)
pscheduler-tool-s3-benchmark
pscheduler-tool-simplestreamer
pscheduler-tool-sleep
pscheduler-tool-sleepbgm
Expand Down

0 comments on commit fa61c40

Please sign in to comment.