Remove separate libedgetpu
- libedgetpu is now built from the edgetpu-api package, so remove the
pbuilder macro for it
- Remove build server configs for building and inserting libedgetpu into
the artifacts
Change-Id: Ib7ae314949bebe9f5f362c63fcb04460668c15da
diff --git a/kokoro/alpha.sh b/kokoro/alpha.sh
index 3ce4dc0..7a9690c 100644
--- a/kokoro/alpha.sh
+++ b/kokoro/alpha.sh
@@ -26,12 +26,6 @@
sudo apt-get install -y haveged
sudo /etc/init.d/haveged start
-# Inject libedgetpu deb build from Blaze into the package directory.
-touch ${PACKAGES_FETCH_ROOT_DIRECTORY}/${PACKAGES_REVISION}/packages.tgz
-m out-dirs
-find ${KOKORO_GFILE_DIR} -name 'libedgetpu*.deb' -exec cp {} ${PRODUCT_OUT}/packages \;
-touch ${PRODUCT_OUT}/.libedgetpu-pbuilder
-
m docker-all
m docker-sdcard
diff --git a/kokoro/continuous.cfg b/kokoro/continuous.cfg
index 5655eb7..9e62184 100644
--- a/kokoro/continuous.cfg
+++ b/kokoro/continuous.cfg
@@ -17,17 +17,3 @@
regex: "packages.tgz"
}
}
-
-before_action {
- invoke_blaze {
- name: "libedgetpu"
- command: BUILD
- targets: "//knowledge/cerebra/spacepark/darwinn:libedgetpu"
- flags: "--compilation_mode=opt"
- flags: "--config=loonix"
- flags: "--define='darwinn_chip=beagle'"
- flags: "--define='darwinn_io=PCI'"
- flags: "--cpu=arm"
- flags: "--compiler=llvm-libcxx"
- }
-}
diff --git a/kokoro/continuous.sh b/kokoro/continuous.sh
index 14f09b7..7a9690c 100644
--- a/kokoro/continuous.sh
+++ b/kokoro/continuous.sh
@@ -26,12 +26,6 @@
sudo apt-get install -y haveged
sudo /etc/init.d/haveged start
-# Inject libedgetpu deb build from Blaze into the package directory.
-touch ${PACKAGES_FETCH_ROOT_DIRECTORY}/${PACKAGES_REVISION}/packages.tgz
-m out-dirs
-find ${KOKORO_BLAZE_DIR} -name 'libedgetpu*.deb' -exec cp {} ${PRODUCT_OUT}/packages \;
-touch ${PRODUCT_OUT}/.libedgetpu-pbuilder
-
m docker-all
m docker-sdcard
diff --git a/kokoro/headless.cfg b/kokoro/headless.cfg
index c81eb77..54fb4e2 100644
--- a/kokoro/headless.cfg
+++ b/kokoro/headless.cfg
@@ -15,17 +15,3 @@
regex: "packages.tgz"
}
}
-
-before_action {
- invoke_blaze {
- name: "libedgetpu"
- command: BUILD
- targets: "//knowledge/cerebra/spacepark/darwinn:libedgetpu"
- flags: "--compilation_mode=opt"
- flags: "--config=loonix"
- flags: "--define='darwinn_chip=beagle'"
- flags: "--define='darwinn_io=PCI'"
- flags: "--cpu=arm"
- flags: "--compiler=llvm-libcxx"
- }
-}
diff --git a/kokoro/headless.sh b/kokoro/headless.sh
index 9c82987..38cdd5f 100644
--- a/kokoro/headless.sh
+++ b/kokoro/headless.sh
@@ -23,12 +23,6 @@
export FETCH_PACKAGES=false
export HEADLESS_BUILD=true
-# Inject libedgetpu deb build from Blaze into the package directory.
-touch ${PACKAGES_FETCH_ROOT_DIRECTORY}/${PACKAGES_REVISION}/packages.tgz
-m out-dirs
-find ${KOKORO_BLAZE_DIR} -name 'libedgetpu*.deb' -exec cp {} ${PRODUCT_OUT}/packages \;
-touch ${PRODUCT_OUT}/.libedgetpu-pbuilder
-
m docker-all
m docker-sdcard
diff --git a/kokoro/release.cfg b/kokoro/release.cfg
index 15518ce..6077745 100644
--- a/kokoro/release.cfg
+++ b/kokoro/release.cfg
@@ -19,17 +19,3 @@
regex: "debian_repo/**"
}
}
-
-before_action {
- invoke_blaze {
- name: "libedgetpu"
- command: BUILD
- targets: "//knowledge/cerebra/spacepark/darwinn:libedgetpu"
- flags: "--compilation_mode=opt"
- flags: "--config=loonix"
- flags: "--define='darwinn_chip=beagle'"
- flags: "--define='darwinn_io=PCI'"
- flags: "--cpu=arm"
- flags: "--compiler=llvm-libcxx"
- }
-}
diff --git a/packages.mk b/packages.mk
index ee61fac..e734dbe 100644
--- a/packages.mk
+++ b/packages.mk
@@ -134,8 +134,7 @@
$(eval $(call make-pbuilder-package-target,base-files,packages/base-files))
ifeq ($(IS_EXTERNAL),)
-$(eval $(call make-pbuilder-package-target,libedgetpu,libedgetpu))
-$(eval $(call make-pbuilder-package-target,edgetpu-api,packages/edgetpu-api,libedgetpu))
+$(eval $(call make-pbuilder-package-target,edgetpu-api,packages/edgetpu-api,,,binary))
endif
ALL_PACKAGE_TARGETS := $(PBUILDER_TARGETS)
diff --git a/rootfs.mk b/rootfs.mk
index 2bbe398..da59af8 100644
--- a/rootfs.mk
+++ b/rootfs.mk
@@ -36,11 +36,10 @@
bluetooth \
bluez \
libbluetooth3 \
- libedgetpu \
uboot-imx
ifeq ($(IS_EXTERNAL),)
-BASE_PACKAGES += libedgetpu edgetpu-api
+BASE_PACKAGES += edgetpu-api
endif
GUI_PACKAGES := \
