From 0bce20a04e06bfdf5317735da0f347d57afc5aa4 Mon Sep 17 00:00:00 2001 From: Matthew Harmsen Date: Tue, 9 Sep 2014 17:31:46 -0700 Subject: Remove 'pki-selinux' code - PKI TRAC Ticket #1139 - Remove 'selinux' code from 'master' branch --- scripts/build_dogtag_pki | 3 +-- scripts/pki_patch_maker | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/build_dogtag_pki b/scripts/build_dogtag_pki index 058abc931..653b9f2fe 100755 --- a/scripts/build_dogtag_pki +++ b/scripts/build_dogtag_pki @@ -125,7 +125,6 @@ PKI_BASE=pki-base${RPM_EXT} PKI_JAVADOC=pki-javadoc${RPM_EXT} PKI_TOOLS=pki-tools${RPM_EXT} PKI_SERVER=pki-server${RPM_EXT} -PKI_SELINUX=pki-selinux${RPM_EXT} PKI_CA=pki-ca${RPM_EXT} PKI_KRA=pki-kra${RPM_EXT} PKI_OCSP=pki-ocsp${RPM_EXT} @@ -159,7 +158,7 @@ cd ${PKI_CORE_PACKAGES_DIR}/${RPM_DIR} mkdir -p ${PKI_CORE_PACKAGES_DIR}/${RPM_DIR}/${COMBINED} cp -p ${NOARCH}/*.rpm ${PKI_ARCH}/*.rpm ${PKI_CORE_PACKAGES_DIR}/${RPM_DIR}/${COMBINED} cd ${PKI_CORE_PACKAGES_DIR}/${RPM_DIR}/${COMBINED} -${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_SYMKEY} ${PKI_BASE} ${PKI_JAVADOC} ${PKI_TOOLS} ${PKI_SERVER} ${PKI_SELINUX} ${PKI_CA} ${PKI_KRA} ${PKI_OCSP} ${PKI_TKS} +${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_SYMKEY} ${PKI_BASE} ${PKI_JAVADOC} ${PKI_TOOLS} ${PKI_SERVER} ${PKI_CA} ${PKI_KRA} ${PKI_OCSP} ${PKI_TKS} # Compose and install 'pki-tps' packages cd ${PKI_PWD} diff --git a/scripts/pki_patch_maker b/scripts/pki_patch_maker index dcd5b5eeb..2803d26fb 100755 --- a/scripts/pki_patch_maker +++ b/scripts/pki_patch_maker @@ -35,7 +35,7 @@ Usage() ## ## Identify source associated with srpm ## -PKI_CORE="base/ca base/common base/java-tools base/native-tools base/selinux base/setup base/symkey base/util" +PKI_CORE="base/ca base/common base/java-tools base/native-tools base/setup base/symkey base/util" ## -- cgit