diff --git a/build/debian-packages/cmake-jessie.diff b/build/debian-packages/cmake-jessie.diff deleted file mode 100644 index 7fd301f90869..000000000000 --- a/build/debian-packages/cmake-jessie.diff +++ /dev/null @@ -1,70 +0,0 @@ -diff -Nru cmake-3.16.3/debian/changelog cmake-3.16.3/debian/changelog ---- cmake-3.16.3/debian/changelog 2020-03-16 19:09:14.000000000 +0900 -+++ cmake-3.16.3/debian/changelog 2020-06-24 14:59:20.000000000 +0900 -@@ -1,3 +1,17 @@ -+cmake (3.16.3-1.deb9moz1) jessie-backports; urgency=medium -+ -+ * Mozilla backport for jessie. -+ * debian/rules, debian/control: -+ - Don't build against system libraries. libuv is missing on jessie, and -+ it's just simpler to disable the use of system libraries altogether. -+ - But still use system curl. -+ - Don't build a dbgsym package through dh_strip, that's not supported on -+ jessie. -+ * debian/compat: Restore a compat level of 10. -+ * debian/control: Remove versioned dependency on debhelper. -+ -+ -- Mike Hommey Wed, 24 Jun 2020 14:59:20 +0900 -+ - cmake (3.16.3-1~bpo9+1) stretch-backports; urgency=medium - - * Rebuild for stretch-backports. -diff -Nru cmake-3.16.3/debian/compat cmake-3.16.3/debian/compat ---- cmake-3.16.3/debian/compat 1970-01-01 09:00:00.000000000 +0900 -+++ cmake-3.16.3/debian/compat 2020-06-24 14:57:28.000000000 +0900 -@@ -0,0 +1 @@ -+10 -diff -Nru cmake-3.16.3/debian/control cmake-3.16.3/debian/control ---- cmake-3.16.3/debian/control 2020-03-16 19:09:14.000000000 +0900 -+++ cmake-3.16.3/debian/control 2020-06-24 14:59:20.000000000 +0900 -@@ -4,17 +4,10 @@ - Maintainer: Debian CMake Team - Uploaders: Lisandro Damián Nicanor Pérez Meyer , - Felix Geyer --Build-Depends: debhelper-compat (= 12), -+Build-Depends: debhelper, - freebsd-glue [kfreebsd-any], -- libarchive-dev (>= 3.3.3), -- libbz2-dev, - libcurl4-openssl-dev | libcurl-ssl-dev, -- libexpat1-dev, -- libjsoncpp-dev, -- liblzma-dev, - libncurses5-dev, -- librhash-dev, -- libuv1-dev (>= 1.10), - procps [!hurd-any], - python3-sphinx, - qtbase5-dev , -diff -Nru cmake-3.16.3/debian/rules cmake-3.16.3/debian/rules ---- cmake-3.16.3/debian/rules 2020-03-16 19:09:14.000000000 +0900 -+++ cmake-3.16.3/debian/rules 2020-06-24 14:59:20.000000000 +0900 -@@ -45,7 +45,7 @@ - override_dh_auto_configure: $(BUILD_FLAGS_FILE) - rm -rf Build && mkdir -p Build - cd Build && ../bootstrap --prefix=/usr --docdir=/share/doc/cmake --mandir=/share/man \ -- --init=../$(BUILD_FLAGS_FILE) --system-libs \ -+ --init=../$(BUILD_FLAGS_FILE) --system-curl \ - --sphinx-man --sphinx-html --sphinx-flags="-D today=\"$(BUILD_DATE)\"" \ - $(BOOTSTRAP_PARALLEL) --verbose - -@@ -71,9 +71,6 @@ - override_dh_sphinxdoc: - dh_sphinxdoc -pcmake-doc - --override_dh_strip: -- dh_strip --dbgsym-migration='cmake-dbg (<< 3.5.0-1~)' -- - %: - dh $@ --with=sphinxdoc --builddirectory=Build - diff --git a/taskcluster/ci/docker-image/kind.yml b/taskcluster/ci/docker-image/kind.yml index 195f9c425215..1843ee38f623 100644 --- a/taskcluster/ci/docker-image/kind.yml +++ b/taskcluster/ci/docker-image/kind.yml @@ -72,11 +72,6 @@ jobs: symbol: I(deb8) parent: debian8-base definition: debian-build - debian8-mozjs-rust-build: - symbol: I(deb8jsrs) - parent: debian8-amd64-build - packages: - - deb8-cmake valgrind-build: symbol: I(vb) parent: debian8-amd64-build diff --git a/taskcluster/ci/packages/kind.yml b/taskcluster/ci/packages/kind.yml index b5e395f74abd..3b014d14cb18 100644 --- a/taskcluster/ci/packages/kind.yml +++ b/taskcluster/ci/packages/kind.yml @@ -60,20 +60,6 @@ jobs: url: http://snapshot.debian.org/archive/debian/20170413T152542Z/pool/main/p/python-setuptools/python-setuptools_33.1.1-1%7Ebpo8%2B1.dsc sha256: e5a152e45151ee2d19959d8266e9bff09f5164ee04a0613aeb8f1d7a304fa073 - deb8-cmake: - description: "Cmake backport for Debian jessie" - treeherder: - symbol: Deb8(cmake) - worker: - env: - DEB_BUILD_PROFILES: stage1 - run: - using: debian-package - dsc: - url: http://snapshot.debian.org/archive/debian/20200320T222820Z/pool/main/c/cmake/cmake_3.16.3-1%7Ebpo9%2B1.dsc - sha256: 714651ac6c974694eb3452f37a70624d3d786ac02fb8ea4eb8fddae44649105d - patch: cmake-jessie.diff - deb10-cmake: description: "Cmake backport for Debian buster" treeherder: diff --git a/taskcluster/docker/debian8-mozjs-rust-build/Dockerfile b/taskcluster/docker/debian8-mozjs-rust-build/Dockerfile deleted file mode 100644 index 4fcdd795d6fe..000000000000 --- a/taskcluster/docker/debian8-mozjs-rust-build/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM $DOCKER_IMAGE_PARENT -MAINTAINER Mike Hommey - -VOLUME /builds/worker/checkouts -VOLUME /builds/worker/workspace -VOLUME /builds/worker/tooltool-cache - -ARG TASKCLUSTER_ROOT_URL -ARG DOCKER_IMAGE_PACKAGES -RUN /usr/local/sbin/setup_packages.sh $TASKCLUSTER_ROOT_URL $DOCKER_IMAGE_PACKAGES && \ - apt-get update && \ - apt-get install cmake