[oe-commits] [meta-openembedded] 50/91: remove slim leftovers
git at git.openembedded.org
git at git.openembedded.org
Mon Apr 9 00:16:46 UTC 2018
This is an automated email from the git hooks/post-receive script.
armin_kuster pushed a commit to branch master-next
in repository meta-openembedded.
commit d67f7edd8d268cabd4b4373bcc10b6a24e60e5ef
Author: Andreas Müller <schnitzeltony at gmail.com>
AuthorDate: Wed Mar 28 10:10:54 2018 +0200
remove slim leftovers
Signed-off-by: Andreas Müller <schnitzeltony at gmail.com>
Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
meta-oe/recipes-graphics/slim/slim/Makefile.oe | 64 ------------------
meta-oe/recipes-graphics/slim/slim/slim-dynwm | 8 ---
meta-oe/recipes-graphics/slim/slim/slim.pamd | 19 ------
meta-oe/recipes-graphics/slim/slim/slim.service | 11 ----
.../recipes-graphics/slim/slim/update_slim_wmlist | 76 ----------------------
5 files changed, 178 deletions(-)
diff --git a/meta-oe/recipes-graphics/slim/slim/Makefile.oe b/meta-oe/recipes-graphics/slim/slim/Makefile.oe
deleted file mode 100644
index 2ee6934..0000000
--- a/meta-oe/recipes-graphics/slim/slim/Makefile.oe
+++ /dev/null
@@ -1,64 +0,0 @@
-# Makefile for slim - OpenEmbedded
-#######################################################
-
-
-SLIMLDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt -lpthread
-CUSTOM=-DHAVE_SHADOW
-
-USE_PAM=1
-ifdef USE_PAM
-SLIMLDFLAGS+= -lpam
-CUSTOM+= -DUSE_PAM
-endif
-
-#######################################################
-
-NAME=slim
-VERSION=1.3.2
-
-DEFINES=-DPACKAGE=\"$(NAME)\" -DVERSION=\"$(VERSION)\" \
- -DPKGDATADIR=\"$(PREFIX)/share/slim\" -DSYSCONFDIR=\"$(CFGDIR)\"
-
-OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o \
- panel.o util.o
-ifdef USE_PAM
-OBJECTS+=PAM.o
-endif
-
-all: slim
-
-slim: $(OBJECTS)
- $(CXX) $(OBJECTS) $(LDFLAGS) $(SLIMLDFLAGS) -o $(NAME)
-
-.cpp.o:
- $(CXX) $(CXXFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@
-
-.c.o:
- $(CC) $(CFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@
-
-install: slim install-theme
- install -D -m 755 slim $(DESTDIR)$(PREFIX)/bin/slim
- install -D -m 644 slim.1 $(DESTDIR)$(MANDIR)/man1/slim.1
- test -e $(DESTDIR)$(CFGDIR)/slim.conf || \
- install -D -m 644 slim.conf $(DESTDIR)$(CFGDIR)/slim.conf
-
-clean:
- @rm -f slim *.o
-
-dist:
- @rm -rf $(NAME)-$(VERSION)
- @mkdir $(NAME)-$(VERSION)
- @cp -r *.cpp *.h *.c Makefile Makefile.* COPYING ChangeLog INSTALL README TODO \
- xinitrc.sample slim.1 THEMES themes slim.conf $(NAME)-$(VERSION)
- @rm -rf $(NAME)-$(VERSION)/themes/.svn $(NAME)-$(VERSION)/themes/default/.svn
- @tar cvzf $(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION)
- @rm -rf $(NAME)-$(VERSION)
-
-
-install-theme:
- install -D -m 644 themes/default/slim.theme \
- $(DESTDIR)$(PREFIX)/share/slim/themes/default/slim.theme
- install -D -m 644 themes/default/panel.png \
- $(DESTDIR)$(PREFIX)/share/slim/themes/default/panel.png
- install -D -m 644 themes/default/background.jpg \
- $(DESTDIR)$(PREFIX)/share/slim/themes/default/background.jpg
diff --git a/meta-oe/recipes-graphics/slim/slim/slim-dynwm b/meta-oe/recipes-graphics/slim/slim/slim-dynwm
deleted file mode 100644
index 49c9d47..0000000
--- a/meta-oe/recipes-graphics/slim/slim/slim-dynwm
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-update_slim_wmlist
-if [ "x$1" = "x-nodaemon" ]; then
- shift
- exec slim "$@"
-else
- slim -d "$@"
-fi
diff --git a/meta-oe/recipes-graphics/slim/slim/slim.pamd b/meta-oe/recipes-graphics/slim/slim/slim.pamd
deleted file mode 100644
index 80c34b1..0000000
--- a/meta-oe/recipes-graphics/slim/slim/slim.pamd
+++ /dev/null
@@ -1,19 +0,0 @@
-# Begin /etc/pam.d/slim
-
-auth required pam_shells.so
-auth include common-auth
-auth optional pam_securetty.so
-auth optional pam_gnome_keyring.so
-
-account required pam_nologin.so
-account include common-account
-
-password include common-password
-
-session include common-session
-session required pam_mkhomedir.so skel=/etc/skel/ umask=0022
-session optional pam_lastlog.so nowtmp
-session optional pam_mail.so dir=/var/mail standard
-session optional pam_gnome_keyring.so auto_start
-
-# End /etc/pam.d/slim
diff --git a/meta-oe/recipes-graphics/slim/slim/slim.service b/meta-oe/recipes-graphics/slim/slim/slim.service
deleted file mode 100644
index 341351a..0000000
--- a/meta-oe/recipes-graphics/slim/slim/slim.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=SLiM Simple Login Manager
-Requires=dev-tty7.device
-After=dev-tty7.device systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/bin/slim -nodaemon
-StandardOutput=syslog
-
-[Install]
-WantedBy=graphical.target
diff --git a/meta-oe/recipes-graphics/slim/slim/update_slim_wmlist b/meta-oe/recipes-graphics/slim/slim/update_slim_wmlist
deleted file mode 100644
index 0f11653..0000000
--- a/meta-oe/recipes-graphics/slim/slim/update_slim_wmlist
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/perl -w
-#
-# update_slim_wmlist, based on:
-# update_wdm_wmlist, (c) 1998 Marcelo Magall�n <mmagallo at debian.org>
-# rewriten to use the x-window-manager alternative
-# modified to also use the x-session-manager alternative by Arthur Korn
-# Copyright 2000 Wichert Akkerman <wakkerma at debian.org>
-# Modified to use the freedesktop.org .desktop like kdm and gdm
-#
-# This script will read the list of installed window managers from
-# the freedesktop .desktop files in <etc>/X11/sessions/:<etc>/dm/Sessions/:
-# <share>/xsessions/
-# and update the sessions line in /etc/slim.conf.
-# BEWARE: It doesn't ask any questions about this. It just does it. It
-# takes an optional list of window managers.
-
-use strict;
-use File::DesktopEntry;
-
-my $wm_list='';
-my %desktop_files;
-
-unless (@ARGV) {
- #my @wm_list = ('default');
- my @wm_list;
- foreach my $dir ('/etc/X11/sessions/','/etc/dm/Sessions/','/usr/share/xsessions/') {
- next unless (opendir DIR, $dir);
- my @files;
- @files = grep { /\.desktop$/ && -r "$dir/$_" } readdir(DIR);
- foreach my $file (@files) {
- push @{$desktop_files{$file}}, "$dir/$file";
- }
- }
- DESKTOP: foreach my $desktop_file (keys(%desktop_files)) {
- foreach my $file (@{$desktop_files{$desktop_file}}) {
- my $entry = File::DesktopEntry->new_from_file($file);
- next DESKTOP if (defined($entry->get_value('Hidden'))
- and $entry->get_value('Hidden') eq 'true');
- if ($entry->get_value('Name') =~ /^gnome$/i) {
- push (@wm_list, 'gnome');
- }
- elsif ($entry->get_value('Name') =~ /^kde$/i) {
- push (@wm_list, 'kde');
- }
- elsif (defined($entry->get_value('Exec'))) {
- push (@wm_list, $entry->get_value('Exec'));
- }
- else { # not found, go to next file
- next;
- }
- # found, proceed to next destop file
- next DESKTOP;
- }
- }
- $wm_list = join (',', sort @wm_list) . ',custom';
-} else {
- $wm_list = join (',', sort @ARGV);
-}
-
-open (SLIM_CONFIG_FILE, '</etc/slim.conf')
- or die "Can't open /etc/slim.conf for reading: $!";
-open (NEW_SLIM_CONFIG_FILE, '>/etc/slim.conf.new')
- or die "Can't open /etc/slim.conf.new for writing: $!";
-
-while (<SLIM_CONFIG_FILE>) {
- s|^(sessions\s*).*|$1$wm_list|;
- print NEW_SLIM_CONFIG_FILE;
-}
-
-close(SLIM_CONFIG_FILE);
-close(NEW_SLIM_CONFIG_FILE);
-
-rename '/etc/slim.conf.new', '/etc/slim.conf'
- or die "Can't rename /etc/slim.conf.new: $!";
-
-exit 0;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list