diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2018-03-28 10:10:54 +0200 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-04-08 17:00:06 -0700 |
commit | 1c108774c9666269f4b72aaac7ef64249a6946bd (patch) | |
tree | 8b052be3b16cc1ffd28ec9244ef904eaefa28ed4 /meta-oe/recipes-graphics | |
parent | c631d3e11be04f4e32a3e76b7d532559a7a3f131 (diff) | |
download | meta-openembedded-1c108774c9666269f4b72aaac7ef64249a6946bd.tar.gz |
remove slim leftovers
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics')
-rw-r--r-- | meta-oe/recipes-graphics/slim/slim/Makefile.oe | 64 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/slim/slim/slim-dynwm | 8 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/slim/slim/slim.pamd | 19 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/slim/slim/slim.service | 11 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/slim/slim/update_slim_wmlist | 76 |
5 files changed, 0 insertions, 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 2ee69346a..000000000 --- a/meta-oe/recipes-graphics/slim/slim/Makefile.oe +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | # Makefile for slim - OpenEmbedded | ||
2 | ####################################################### | ||
3 | |||
4 | |||
5 | SLIMLDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt -lpthread | ||
6 | CUSTOM=-DHAVE_SHADOW | ||
7 | |||
8 | USE_PAM=1 | ||
9 | ifdef USE_PAM | ||
10 | SLIMLDFLAGS+= -lpam | ||
11 | CUSTOM+= -DUSE_PAM | ||
12 | endif | ||
13 | |||
14 | ####################################################### | ||
15 | |||
16 | NAME=slim | ||
17 | VERSION=1.3.2 | ||
18 | |||
19 | DEFINES=-DPACKAGE=\"$(NAME)\" -DVERSION=\"$(VERSION)\" \ | ||
20 | -DPKGDATADIR=\"$(PREFIX)/share/slim\" -DSYSCONFDIR=\"$(CFGDIR)\" | ||
21 | |||
22 | OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o \ | ||
23 | panel.o util.o | ||
24 | ifdef USE_PAM | ||
25 | OBJECTS+=PAM.o | ||
26 | endif | ||
27 | |||
28 | all: slim | ||
29 | |||
30 | slim: $(OBJECTS) | ||
31 | $(CXX) $(OBJECTS) $(LDFLAGS) $(SLIMLDFLAGS) -o $(NAME) | ||
32 | |||
33 | .cpp.o: | ||
34 | $(CXX) $(CXXFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@ | ||
35 | |||
36 | .c.o: | ||
37 | $(CC) $(CFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@ | ||
38 | |||
39 | install: slim install-theme | ||
40 | install -D -m 755 slim $(DESTDIR)$(PREFIX)/bin/slim | ||
41 | install -D -m 644 slim.1 $(DESTDIR)$(MANDIR)/man1/slim.1 | ||
42 | test -e $(DESTDIR)$(CFGDIR)/slim.conf || \ | ||
43 | install -D -m 644 slim.conf $(DESTDIR)$(CFGDIR)/slim.conf | ||
44 | |||
45 | clean: | ||
46 | @rm -f slim *.o | ||
47 | |||
48 | dist: | ||
49 | @rm -rf $(NAME)-$(VERSION) | ||
50 | @mkdir $(NAME)-$(VERSION) | ||
51 | @cp -r *.cpp *.h *.c Makefile Makefile.* COPYING ChangeLog INSTALL README TODO \ | ||
52 | xinitrc.sample slim.1 THEMES themes slim.conf $(NAME)-$(VERSION) | ||
53 | @rm -rf $(NAME)-$(VERSION)/themes/.svn $(NAME)-$(VERSION)/themes/default/.svn | ||
54 | @tar cvzf $(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION) | ||
55 | @rm -rf $(NAME)-$(VERSION) | ||
56 | |||
57 | |||
58 | install-theme: | ||
59 | install -D -m 644 themes/default/slim.theme \ | ||
60 | $(DESTDIR)$(PREFIX)/share/slim/themes/default/slim.theme | ||
61 | install -D -m 644 themes/default/panel.png \ | ||
62 | $(DESTDIR)$(PREFIX)/share/slim/themes/default/panel.png | ||
63 | install -D -m 644 themes/default/background.jpg \ | ||
64 | $(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 49c9d47ec..000000000 --- a/meta-oe/recipes-graphics/slim/slim/slim-dynwm +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | update_slim_wmlist | ||
3 | if [ "x$1" = "x-nodaemon" ]; then | ||
4 | shift | ||
5 | exec slim "$@" | ||
6 | else | ||
7 | slim -d "$@" | ||
8 | 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 80c34b1db..000000000 --- a/meta-oe/recipes-graphics/slim/slim/slim.pamd +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | # Begin /etc/pam.d/slim | ||
2 | |||
3 | auth required pam_shells.so | ||
4 | auth include common-auth | ||
5 | auth optional pam_securetty.so | ||
6 | auth optional pam_gnome_keyring.so | ||
7 | |||
8 | account required pam_nologin.so | ||
9 | account include common-account | ||
10 | |||
11 | password include common-password | ||
12 | |||
13 | session include common-session | ||
14 | session required pam_mkhomedir.so skel=/etc/skel/ umask=0022 | ||
15 | session optional pam_lastlog.so nowtmp | ||
16 | session optional pam_mail.so dir=/var/mail standard | ||
17 | session optional pam_gnome_keyring.so auto_start | ||
18 | |||
19 | # 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 341351aad..000000000 --- a/meta-oe/recipes-graphics/slim/slim/slim.service +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | [Unit] | ||
2 | Description=SLiM Simple Login Manager | ||
3 | Requires=dev-tty7.device | ||
4 | After=dev-tty7.device systemd-user-sessions.service | ||
5 | |||
6 | [Service] | ||
7 | ExecStart=/usr/bin/slim -nodaemon | ||
8 | StandardOutput=syslog | ||
9 | |||
10 | [Install] | ||
11 | 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 0f116537f..000000000 --- a/meta-oe/recipes-graphics/slim/slim/update_slim_wmlist +++ /dev/null | |||
@@ -1,76 +0,0 @@ | |||
1 | #!/usr/bin/perl -w | ||
2 | # | ||
3 | # update_slim_wmlist, based on: | ||
4 | # update_wdm_wmlist, (c) 1998 Marcelo Magallón <mmagallo@debian.org> | ||
5 | # rewriten to use the x-window-manager alternative | ||
6 | # modified to also use the x-session-manager alternative by Arthur Korn | ||
7 | # Copyright 2000 Wichert Akkerman <wakkerma@debian.org> | ||
8 | # Modified to use the freedesktop.org .desktop like kdm and gdm | ||
9 | # | ||
10 | # This script will read the list of installed window managers from | ||
11 | # the freedesktop .desktop files in <etc>/X11/sessions/:<etc>/dm/Sessions/: | ||
12 | # <share>/xsessions/ | ||
13 | # and update the sessions line in /etc/slim.conf. | ||
14 | # BEWARE: It doesn't ask any questions about this. It just does it. It | ||
15 | # takes an optional list of window managers. | ||
16 | |||
17 | use strict; | ||
18 | use File::DesktopEntry; | ||
19 | |||
20 | my $wm_list=''; | ||
21 | my %desktop_files; | ||
22 | |||
23 | unless (@ARGV) { | ||
24 | #my @wm_list = ('default'); | ||
25 | my @wm_list; | ||
26 | foreach my $dir ('/etc/X11/sessions/','/etc/dm/Sessions/','/usr/share/xsessions/') { | ||
27 | next unless (opendir DIR, $dir); | ||
28 | my @files; | ||
29 | @files = grep { /\.desktop$/ && -r "$dir/$_" } readdir(DIR); | ||
30 | foreach my $file (@files) { | ||
31 | push @{$desktop_files{$file}}, "$dir/$file"; | ||
32 | } | ||
33 | } | ||
34 | DESKTOP: foreach my $desktop_file (keys(%desktop_files)) { | ||
35 | foreach my $file (@{$desktop_files{$desktop_file}}) { | ||
36 | my $entry = File::DesktopEntry->new_from_file($file); | ||
37 | next DESKTOP if (defined($entry->get_value('Hidden')) | ||
38 | and $entry->get_value('Hidden') eq 'true'); | ||
39 | if ($entry->get_value('Name') =~ /^gnome$/i) { | ||
40 | push (@wm_list, 'gnome'); | ||
41 | } | ||
42 | elsif ($entry->get_value('Name') =~ /^kde$/i) { | ||
43 | push (@wm_list, 'kde'); | ||
44 | } | ||
45 | elsif (defined($entry->get_value('Exec'))) { | ||
46 | push (@wm_list, $entry->get_value('Exec')); | ||
47 | } | ||
48 | else { # not found, go to next file | ||
49 | next; | ||
50 | } | ||
51 | # found, proceed to next destop file | ||
52 | next DESKTOP; | ||
53 | } | ||
54 | } | ||
55 | $wm_list = join (',', sort @wm_list) . ',custom'; | ||
56 | } else { | ||
57 | $wm_list = join (',', sort @ARGV); | ||
58 | } | ||
59 | |||
60 | open (SLIM_CONFIG_FILE, '</etc/slim.conf') | ||
61 | or die "Can't open /etc/slim.conf for reading: $!"; | ||
62 | open (NEW_SLIM_CONFIG_FILE, '>/etc/slim.conf.new') | ||
63 | or die "Can't open /etc/slim.conf.new for writing: $!"; | ||
64 | |||
65 | while (<SLIM_CONFIG_FILE>) { | ||
66 | s|^(sessions\s*).*|$1$wm_list|; | ||
67 | print NEW_SLIM_CONFIG_FILE; | ||
68 | } | ||
69 | |||
70 | close(SLIM_CONFIG_FILE); | ||
71 | close(NEW_SLIM_CONFIG_FILE); | ||
72 | |||
73 | rename '/etc/slim.conf.new', '/etc/slim.conf' | ||
74 | or die "Can't rename /etc/slim.conf.new: $!"; | ||
75 | |||
76 | exit 0; | ||