[meta-selinux] dhcp: remove bbappend file

Submitted by Qi.Chen@windriver.com on Sept. 8, 2020, 1:44 a.m. | Patch ID: 176143

Details

Message ID 20200908014407.9211-1-Qi.Chen@windriver.com
State New
Headers show

Commit Message

Qi.Chen@windriver.com Sept. 8, 2020, 1:44 a.m.
Issue: LINUXEXEC-9571

dhcp has been removed, thus removing its bbappend file.

(LOCAL REV: NOT UPSTREAM) -- sent to yocto on 20200907

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 recipes-connectivity/dhcp/dhcp_%.bbappend   |  1 -
 recipes-connectivity/dhcp/dhcp_selinux.inc  |  3 --
 recipes-connectivity/dhcp/files/init-server | 52 ---------------------
 3 files changed, 56 deletions(-)
 delete mode 100644 recipes-connectivity/dhcp/dhcp_%.bbappend
 delete mode 100644 recipes-connectivity/dhcp/dhcp_selinux.inc
 delete mode 100644 recipes-connectivity/dhcp/files/init-server

Patch hide | download patch | download mbox

diff --git a/recipes-connectivity/dhcp/dhcp_%.bbappend b/recipes-connectivity/dhcp/dhcp_%.bbappend
deleted file mode 100644
index 7719d3b..0000000
--- a/recipes-connectivity/dhcp/dhcp_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@ 
-require ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', '${BPN}_selinux.inc', '', d)}
diff --git a/recipes-connectivity/dhcp/dhcp_selinux.inc b/recipes-connectivity/dhcp/dhcp_selinux.inc
deleted file mode 100644
index 08389f1..0000000
--- a/recipes-connectivity/dhcp/dhcp_selinux.inc
+++ /dev/null
@@ -1,3 +0,0 @@ 
-inherit selinux
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
diff --git a/recipes-connectivity/dhcp/files/init-server b/recipes-connectivity/dhcp/files/init-server
deleted file mode 100644
index a0e901a..0000000
--- a/recipes-connectivity/dhcp/files/init-server
+++ /dev/null
@@ -1,52 +0,0 @@ 
-#!/bin/sh
-#
-# $Id: dhcp3-server.init.d,v 1.4 2003/07/13 19:12:41 mdz Exp $
-#
-
-test -f /usr/sbin/dhcpd || exit 0
-
-# It is not safe to start if we don't have a default configuration...
-if [ ! -f /etc/default/dhcp-server ]; then
-	echo "/etc/default/dhcp-server does not exist! - Aborting..."
-	exit 0
-fi
-
-# Read init script configuration (so far only interfaces the daemon
-# should listen on.)
-. /etc/default/dhcp-server
-
-# Restorecon for /var/lib/dhcp/{dhcpd.leases,dhcpd6.leases}
-restorecon_dhcpd_leases(){
-	test ! -x /sbin/restorecon || for x in dhcpd.leases dhcpd6.leases; do
-		[ -f /var/lib/dhcp/$x ] && /sbin/restorecon -F /var/lib/dhcp/$x
-	done
-}
-
-case "$1" in
-	start)
-		echo -n "Starting DHCP server: "
-		test -d /var/lib/dhcp/ || mkdir -p /var/lib/dhcp/
-		test -f /var/lib/dhcp/dhcpd.leases || touch /var/lib/dhcp/dhcpd.leases	
-		restorecon_dhcpd_leases
-		start-stop-daemon -S -x /usr/sbin/dhcpd -- -q $INTERFACES -user dhcp -group dhcp
-		echo "."
-		;;
-	stop)
-		echo -n "Stopping DHCP server: dhcpd3"
-		start-stop-daemon -K -x /usr/sbin/dhcpd
-		echo "."
-		;;
-	restart | force-reload)
-		$0 stop
-		sleep 2
-		$0 start
-		if [ "$?" != "0" ]; then
-			exit 1
-		fi
-		;;
-	*)
-		echo "Usage: /etc/init.d/dhcp-server {start|stop|restart|force-reload}"
-		exit 1 
-esac
-
-exit 0