mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-30 21:52:45 +00:00
remove slim leftovers
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Andreas Müller
Armin Kuster
parent
c631d3e11b
commit
1c108774c9
@ -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
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
update_slim_wmlist
|
|
||||||
if [ "x$1" = "x-nodaemon" ]; then
|
|
||||||
shift
|
|
||||||
exec slim "$@"
|
|
||||||
else
|
|
||||||
slim -d "$@"
|
|
||||||
fi
|
|
||||||
@ -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
|
|
||||||
@ -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
|
|
||||||
@ -1,76 +0,0 @@
|
|||||||
#!/usr/bin/perl -w
|
|
||||||
#
|
|
||||||
# update_slim_wmlist, based on:
|
|
||||||
# update_wdm_wmlist, (c) 1998 Marcelo Magallón <mmagallo@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@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;
|
|
||||||
Loading…
x
Reference in New Issue
Block a user