From 9b41814f1db818940dfcecbf30d94b8bba29ed26 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Wed, 1 Aug 2018 14:20:22 -0400
Subject: [PATCH] Relocate dpkg to stx-integ/base/dpkg

Move content from stx-gplv2 into stx-integ

Packages will be relocated to

stx-integ:
    base/
        bash
        cgcs-users
        cluster-resource-agents
        dpkg
        haproxy
        libfdt
        netpbm
        rpm

    database/
        mariadb

    filesystem/
        iscsi-initiator-utils

    filesystem/drbd/
        drbd-tools

    kernel/kernel-modules/
        drbd
        integrity
        intel-e1000e
        intel-i40e
        intel-i40evf
        intel-ixgbe
        intel-ixgbevf
        qat17
        tpmdd

    ldap/
        ldapscripts

    networking/
        iptables
        net-tools

Change-Id: Id657cfc9f504f5fd7d464dfa5c74c5b0bf245c7c
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
---
 centos_pkg_dirs             |  1 -
 dpkg/.gitignore             |  6 ------
 dpkg/README                 |  4 ----
 dpkg/centos/build_srpm.data |  2 --
 dpkg/centos/dpkg.spec       | 43 -------------------------------------
 5 files changed, 56 deletions(-)
 delete mode 100644 dpkg/.gitignore
 delete mode 100644 dpkg/README
 delete mode 100644 dpkg/centos/build_srpm.data
 delete mode 100644 dpkg/centos/dpkg.spec

diff --git a/centos_pkg_dirs b/centos_pkg_dirs
index f27cc70..66043ff 100644
--- a/centos_pkg_dirs
+++ b/centos_pkg_dirs
@@ -1,4 +1,3 @@
-dpkg
 cgcs-users
 cluster-resource-agents
 libfdt
diff --git a/dpkg/.gitignore b/dpkg/.gitignore
deleted file mode 100644
index 95e75bd..0000000
--- a/dpkg/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-!.distro
-.distro/centos7/rpmbuild/RPMS
-.distro/centos7/rpmbuild/SRPMS
-.distro/centos7/rpmbuild/BUILD
-.distro/centos7/rpmbuild/BUILDROOT
-.distro/centos7/rpmbuild/SOURCES/dpkg*tar.gz
diff --git a/dpkg/README b/dpkg/README
deleted file mode 100644
index 27334c7..0000000
--- a/dpkg/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Many Titanium Cloud init services are using start-stop-daemon.  It's not available under
-centos.  Just pull it from dpkg but don't install everything.
-
-Source: http://ftp.de.debian.org/debian/pool/main/d/dpkg/
diff --git a/dpkg/centos/build_srpm.data b/dpkg/centos/build_srpm.data
deleted file mode 100644
index 129d3fb..0000000
--- a/dpkg/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-COPY_LIST="$CGCS_BASE/downloads/dpkg_1.18.24.tar.xz"
-TIS_PATCH_VER=1
diff --git a/dpkg/centos/dpkg.spec b/dpkg/centos/dpkg.spec
deleted file mode 100644
index b893ebe..0000000
--- a/dpkg/centos/dpkg.spec
+++ /dev/null
@@ -1,43 +0,0 @@
-Summary: dpkg
-Name: dpkg
-Version: 1.18.24
-Release: 0%{?_tis_dist}.%{tis_patch_ver}
-License: GPLv2 and GPLv2+ and LGPLv2+ and Public Domain and BSD
-Group: base
-Packager: Wind River <info@windriver.com>
-URL: unknown
-Source0: %{name}_%{version}.tar.xz
-
-BuildRequires: gcc
-BuildRequires: gcc-c++
-BuildRequires: ncurses-static
-BuildRequires: perl-version
-
-%description
-dpkg
-
-%define local_bindir /usr/bin/
-
-%prep
-%setup
-
-%build
-./configure --prefix=$RPM_BUILD_ROOT \
-            --disable-dselect \
-            --disable-update-alternatives \
-            --without-liblzma
-make -j"%(nproc)"
-
-%install
-# Don't install everything, it's too dangerous
-# make install
-
-install -d -m 755 %{buildroot}%{local_bindir}
-install -p -D -m 700 utils/start-stop-daemon %{buildroot}%{local_bindir}/start-stop-daemon
-
-%clean
-rm -rf $RPM_BUILD_ROOT 
-
-%files
-%defattr(-,root,root,-)
-%{local_bindir}/*