diff mbox series

UBUNTU: [Packaging] Remove debian.aws-20.10/scripts/helpers/copy-files

Message ID 20210414150147.12635-2-tim.gardner@canonical.com
State New
Headers show
Series UBUNTU: [Packaging] Remove debian.aws-20.10/scripts/helpers/copy-files | expand

Commit Message

Tim Gardner April 14, 2021, 3:01 p.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1923859

This file is superfluous and confusing.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 debian.aws-20.10/scripts/helpers/copy-files | 67 ---------------------
 debian.aws/reconstruct                      |  1 -
 2 files changed, 68 deletions(-)
 delete mode 100755 debian.aws-20.10/scripts/helpers/copy-files
diff mbox series

Patch

diff --git a/debian.aws-20.10/scripts/helpers/copy-files b/debian.aws-20.10/scripts/helpers/copy-files
deleted file mode 100755
index 0ce0afe84578..000000000000
--- a/debian.aws-20.10/scripts/helpers/copy-files
+++ /dev/null
@@ -1,67 +0,0 @@ 
-#!/bin/bash -eu
-
-if [ -f debian/debian.env ]; then
-	# shellcheck disable=SC1091
-	. debian/debian.env
-fi
-
-if [ ! -d "${DEBIAN}" ]; then
-	echo You must run this script from the top directory of this repository.
-	exit 1
-fi
-
-CONF="${DEBIAN}"/etc/update.conf
-if [ -f "${CONF}" ]; then
-	# shellcheck disable=SC1090
-	. "${CONF}"
-fi
-
-FOREIGN_ARCHES=""
-LOCAL_CONF="${DEBIAN}/etc/local.conf"
-if [ -f "${LOCAL_CONF}" ]; then
-	# shellcheck disable=SC1090
-	. "${LOCAL_CONF}"
-fi
-
-SKIP_RULES_D=${SKIP_RULES_D:-}
-
-#
-# Pick up any master branch changes to udeb modules or firmware.
-#
-rsync -avc --delete "${DEBIAN_MASTER}/d-i/" "${DEBIAN}/d-i"
-
-#
-# Update configs from master
-#
-rsync -avc --delete "${DEBIAN_MASTER}/config/" "${DEBIAN}/config"
-
-#
-# Update package and DTB settings from master.
-#
-if [ -z "${SKIP_RULES_D}" ] ; then
-	rsync -avc "${DEBIAN_MASTER}/rules.d/"*.mk "${DEBIAN}/rules.d/"
-fi
-
-# Remove the .mk files from the arch's that are not supported
-for i in ${FOREIGN_ARCHES}
-do
-	rm -f "${DEBIAN}/rules.d/${i}.mk"
-	git rm -f --ignore-unmatch "${DEBIAN}/rules.d/${i}.mk" || true
-done
-
-#
-# Update modprobe.d from master
-#
-# Some releases (trusty) don't have this directory, and rsync would fail
-# without this check.
-if [ -d "${DEBIAN}/modprobe.d/" ]; then
-	rsync -avc --delete "${DEBIAN_MASTER}/modprobe.d/" "${DEBIAN}/modprobe.d"
-fi
-
-cp -p "${DEBIAN_MASTER}/control.d/"*.inclusion-list "${DEBIAN}/control.d"
-
-cp -p "${DEBIAN_MASTER}/reconstruct" "${DEBIAN}/reconstruct"
-
-if [ -x "${DEBIAN}/scripts/helpers/local-mangle" ]; then
-	"./${DEBIAN}/scripts/helpers/local-mangle"
-fi
diff --git a/debian.aws/reconstruct b/debian.aws/reconstruct
index 49b0e9daeb4f..a0d2c9f3625d 100644
--- a/debian.aws/reconstruct
+++ b/debian.aws/reconstruct
@@ -13,7 +13,6 @@  rm -f 'tools/arch/x86/include/asm/mcsafe_test.h'
 rm -f 'tools/perf/bench/mem-memcpy-x86-64-lib.c'
 rm -f 'tools/testing/kunit/.gitattributes'
 chmod +x 'arch/riscv/kernel/vdso/so2s.sh'
-chmod +x 'debian.aws-20.10/scripts/helpers/copy-files'
 chmod +x 'debian/cloud-tools/hv_get_dhcp_info'
 chmod +x 'debian/cloud-tools/hv_get_dns_info'
 chmod +x 'debian/cloud-tools/hv_set_ifconfig'