Skip to content

Commit

Permalink
Set version to 2.4.1~1.0.0, reenabled tests and nnstreamer-test-dev f…
Browse files Browse the repository at this point in the history
…or aarch64
  • Loading branch information
ep-tpstevens committed Oct 4, 2024
1 parent 71f684c commit c145db5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
7 changes: 7 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
nnstreamer (2.4.1+1.0.0) jammy; urgency=medium

* Add support for aarch64 builds
* Add more flexible build infrastructure across debuild and Jenkins

-- Tyler Stevens <[email protected]> Fri, 04 Oct 2024 16:42:30 -0700

nnstreamer (2.4.1+nmu4) UNRELEASED; urgency=medium

* tensor_filter ONNX: allow accleration
Expand Down
7 changes: 3 additions & 4 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ endif

%:
ifeq ($(EYEPOP_PLATFORM),linux-aarch64-jammy)
dh $@ --parallel --without=nnstreamer-tensorflow --without=nnstreamer-edgetpu --without=nnstreamer-openvino --without=nnstreamer-onnxruntime --without=nnstreamer-test-dev
dh $@ --parallel --without=nnstreamer-tensorflow --without=nnstreamer-edgetpu --without=nnstreamer-openvino --without=nnstreamer-onnxruntime
else
dh $@ --parallel
endif
Expand All @@ -67,7 +67,7 @@ ifeq ($(EYEPOP_PLATFORM),linux-aarch64-jammy)
-Denable-edgetpu=false -Denable-openvino=false -Dgrpc-support=disabled -Dmqtt-support=enabled \
-Ddatarepo-support=enabled \
-Dtf-support=disabled -Donnxruntime-support=disabled \
-Denable-tizen=false -Denable-test=false -Dinstall-test=true -Dsubplugindir=/usr/lib/nnstreamer $(FLOAT16) ${BUILDDIR}
-Denable-tizen=false -Denable-test=true -Dinstall-test=true -Dsubplugindir=/usr/lib/nnstreamer $(FLOAT16) ${BUILDDIR}
else ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes), yes)
meson --buildtype=plain --prefix=/usr --sysconfdir=/etc --libdir=lib/$(DEB_HOST_MULTIARCH) --bindir=lib/nnstreamer/bin --includedir=include \
-Denable-edgetpu=true -Denable-openvino=true -Dgrpc-support=disabled -Dmqtt-support=enabled \
Expand All @@ -88,7 +88,6 @@ ifeq ($(EYEPOP_PLATFORM),linux-aarch64-jammy)
rm -f debian/nnstreamer-edgetpu.install
rm -f debian/nnstreamer-openvino.install
rm -f debian/nnstreamer-onnxruntime.install
rm -f debian/nnstreamer-test-dev.install
endif
# A few modules are not available in Ubuntu 22.04. Don't try to create them if not available.
if [ -f './build/ext/nnstreamer/tensor_filter/libnnstreamer_filter_nnfw.so' ]; then echo "NNFW exists" ; else rm -f debian/nnstreamer-nnfw.install; fi
Expand All @@ -112,7 +111,7 @@ override_dh_auto_install:
DESTDIR=$(CURDIR)/debian/tmp ninja -C ${BUILDDIR} install

override_dh_gencontrol:
dh_gencontrol -- -v$(VERSION)~$(PLATFORM)
dh_gencontrol -- -v$(VERSION)~$(EYEPOP_PLATFORM)

override_dh_install:
dh_install --sourcedir=debian/tmp --list-missing
Expand Down

0 comments on commit c145db5

Please sign in to comment.