Revert "wip! plymouth: stub out drm escrow program"

This reverts commit 12b03bf60e9ba7e3a4e400aca0b7c2fdefbb762f.

diff --git a/configure.ac b/configure.ac
index ecb5fd9d60e2125f6e8af14d5895414190d807b3..b51a700e7615f7ea203b4f0932d94934c3dbfe39 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -310,7 +310,6 @@ AC_CONFIG_FILES([Makefile
            src/Makefile
            src/client/ply-boot-client.pc
            src/client/Makefile
-           src/drm-escrow/Makefile
            src/upstart-bridge/Makefile
            themes/Makefile
            themes/spinfinity/Makefile

diff --git a/src/drm-escrow/Makefile.am b/src/drm-escrow/Makefile.am
deleted file mode 100644 (file)
index 21f53ef..0000000
--- a/src/drm-escrow/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-AM_CPPFLAGS = -I$(top_srcdir)                                                 \
-           -I$(top_srcdir)/src                                                \
-           -I$(top_srcdir)/src/libply                                         \
-           -I$(srcdir)
-
-plymouth_drm_escrowdir = $(plymouthclientdir)
-
-plymouth_drm_escrow_PROGRAMS = plymouth-drm-escrow
-
-plymouth_drm_escrow_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLYMOUTH_PLUGIN_PATH=\"$(PLYMOUTH_PLUGIN_PATH)\"
-plymouth_drm_escrow_LDADD = $(PLYMOUTH_LIBS) ../libply/libply.la
-plymouth_drm_escrow_SOURCES = $(srcdir)/plymouth-drm-escrow.c
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = ply-boot-client.pc
-
-MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/drm-escrow/plymouth-drm-escrow.c b/src/drm-escrow/plymouth-drm-escrow.c
deleted file mode 100644 (file)
index 22cb921..0000000
--- a/src/drm-escrow/plymouth-drm-escrow.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* plymouth-drm-escrow.c - hold on to drm fd at shutdown to stop flicker
- *
- * Copyright (C) 2018 Red Hat, Inc
- *
- * This file is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * This file is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Written by: Ray Strode <rstrode@redhat.com>
- */
-#include "config.h"
-#include <stdbool.h>
-#include <sysexits.h>
-#include <unistd.h>
-
-int
-main (int    argc,
-      char **argv)
-{
-        /* Make the first byte in argv be '@' so that we can survive systemd's killing
-         * spree when going from initrd to /, and so we stay alive all the way until
-         * the power is killed at shutdown.
-         * http://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons
-         */
-        argv[0][0] = '@';
-
-        /* We don't actually do anything.  The drm fd was passed to us on some fd,
-         * and we just need to keep it open until by staying alive until we're killed
-         */
-        while (true) pause ();
-
-        return EX_SOFTWARE;
-}
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */