From 8da8e90c5ca8eaa46219fba2c28d3ec19e26c48d Mon Sep 17 00:00:00 2001 From: Zhenggen Xu Date: Thu, 25 Oct 2018 11:18:06 -0700 Subject: [PATCH] Change the target from sonic.debian8 to sonic8 to avoid conflicts Signed-off-by: Zhenggen Xu --- debianpkg/Makefile.am | 10 +++++----- debianpkg/backports/sonic.debian8/versionext | 1 - .../{sonic.debian8 => sonic8}/debian/frr.install | 0 .../backports/{sonic.debian8 => sonic8}/debian/rules | 0 .../{sonic.debian8 => sonic8}/debian/source/format | 0 debianpkg/backports/{sonic.debian8 => sonic8}/exclude | 0 debianpkg/backports/sonic8/versionext | 1 + debianpkg/rules | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 debianpkg/backports/sonic.debian8/versionext rename debianpkg/backports/{sonic.debian8 => sonic8}/debian/frr.install (100%) rename debianpkg/backports/{sonic.debian8 => sonic8}/debian/rules (100%) rename debianpkg/backports/{sonic.debian8 => sonic8}/debian/source/format (100%) rename debianpkg/backports/{sonic.debian8 => sonic8}/exclude (100%) create mode 100644 debianpkg/backports/sonic8/versionext diff --git a/debianpkg/Makefile.am b/debianpkg/Makefile.am index b52a0d9cae..b557adfab3 100644 --- a/debianpkg/Makefile.am +++ b/debianpkg/Makefile.am @@ -10,11 +10,11 @@ EXTRA_DIST = README.Debian README.Maintainer \ backports/debian9/debian/source/format \ backports/debian9/exclude \ backports/debian9/versionext \ - backports/sonic.debian8/debian/frr.install \ - backports/sonic.debian8/debian/rules \ - backports/sonic.debian8/debian/source/format \ - backports/sonic.debian8/exclude \ - backports/sonic.debian8/versionext \ + backports/sonic8/debian/frr.install \ + backports/sonic8/debian/rules \ + backports/sonic8/debian/source/format \ + backports/sonic8/exclude \ + backports/sonic8/versionext \ backports/ubuntu12.04/debian/control \ backports/ubuntu12.04/debian/frr.install \ backports/ubuntu12.04/debian/frr.postinst \ diff --git a/debianpkg/backports/sonic.debian8/versionext b/debianpkg/backports/sonic.debian8/versionext deleted file mode 100644 index dbe055af4f..0000000000 --- a/debianpkg/backports/sonic.debian8/versionext +++ /dev/null @@ -1 +0,0 @@ --1~sonic.debian8+1 diff --git a/debianpkg/backports/sonic.debian8/debian/frr.install b/debianpkg/backports/sonic8/debian/frr.install similarity index 100% rename from debianpkg/backports/sonic.debian8/debian/frr.install rename to debianpkg/backports/sonic8/debian/frr.install diff --git a/debianpkg/backports/sonic.debian8/debian/rules b/debianpkg/backports/sonic8/debian/rules similarity index 100% rename from debianpkg/backports/sonic.debian8/debian/rules rename to debianpkg/backports/sonic8/debian/rules diff --git a/debianpkg/backports/sonic.debian8/debian/source/format b/debianpkg/backports/sonic8/debian/source/format similarity index 100% rename from debianpkg/backports/sonic.debian8/debian/source/format rename to debianpkg/backports/sonic8/debian/source/format diff --git a/debianpkg/backports/sonic.debian8/exclude b/debianpkg/backports/sonic8/exclude similarity index 100% rename from debianpkg/backports/sonic.debian8/exclude rename to debianpkg/backports/sonic8/exclude diff --git a/debianpkg/backports/sonic8/versionext b/debianpkg/backports/sonic8/versionext new file mode 100644 index 0000000000..a7aaf14ed5 --- /dev/null +++ b/debianpkg/backports/sonic8/versionext @@ -0,0 +1 @@ +-1~sonic8+1 diff --git a/debianpkg/rules b/debianpkg/rules index 889ff9eb01..c8981a42d3 100755 --- a/debianpkg/rules +++ b/debianpkg/rules @@ -213,7 +213,7 @@ override_dh_systemd_enable: # backports SRCPKG = frr -KNOWN_BACKPORTS = debian8 debian9 sonic.debian8 ubuntu12.04 ubuntu14.04 ubuntu16.04 ubuntu17.10 ubuntu18.04 +KNOWN_BACKPORTS = debian8 debian9 sonic8 ubuntu12.04 ubuntu14.04 ubuntu16.04 ubuntu17.10 ubuntu18.04 DEBIAN_VERSION := $(shell dh_testdir && \ dpkg-parsechangelog -c1 < debian/changelog | \ sed -rn 's/^Version: ?//p') -- 2.39.5