From 6a24b8e6be5393c5ad37a67d200ce60d19f95903 Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Fri, 9 Mar 2018 07:32:56 +0100 Subject: [PATCH] check_tree.pl : Add handling of .gperf files. --- pwx/check_tree.pl | 3 ++- src/login/logind-gperf.gperf | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pwx/check_tree.pl b/pwx/check_tree.pl index 1b323b0d2..e0d6c7ad1 100755 --- a/pwx/check_tree.pl +++ b/pwx/check_tree.pl @@ -12,6 +12,7 @@ # 0.8.2 2018-03-06 sed, PrydeWorX Added checks for elogind_*() function call removals. # 0.8.3 2018-03-08 sed, PrydeWorX Handle systemd-logind <=> elogind renames. Do not allow moving of # commented out includes under out elogind block. +# 0.8.4 2018-03-09 sed, PrydeWorX Added handling of .gperf files. # # ======================== # === Little TODO list === @@ -20,7 +21,6 @@ # python tools and man sources always generate useless patches. Real patches # are in danger of getting overlooked. # - Add handling of the *.sym files. -# - Find a masking solution for login/logind-gperf.gperf # use strict; use warnings; @@ -1153,6 +1153,7 @@ sub diff_hFile { # Shell and meson files must be prepared. See prepare_meson() ( $hFile{source} =~ m/meson/ or + $hFile{source} =~ m/\.gperf$/ or $hFile{source} =~ m/\.in$/ or $hFile{source} =~ m/\.pl$/ or $hFile{source} =~ m/\.sh$/ ) and prepare_shell; diff --git a/src/login/logind-gperf.gperf b/src/login/logind-gperf.gperf index c7f54b5f5..a3c0861e5 100644 --- a/src/login/logind-gperf.gperf +++ b/src/login/logind-gperf.gperf @@ -14,6 +14,10 @@ struct ConfigPerfItem; %struct-type %includes %% +#if 0 /// UNNEEDED by elogind +# Login.NAutoVTs, config_parse_n_autovts, 0, offsetof(Manager, n_autovts) +# Login.ReserveVT, config_parse_unsigned, 0, offsetof(Manager, reserve_vt) +#endif // 0 Login.KillUserProcesses, config_parse_bool, 0, offsetof(Manager, kill_user_processes) Login.KillOnlyUsers, config_parse_strv, 0, offsetof(Manager, kill_only_users) Login.KillExcludeUsers, config_parse_strv, 0, offsetof(Manager, kill_exclude_users) @@ -35,9 +39,11 @@ Login.RemoveIPC, config_parse_bool, 0, offsetof(Manag Login.InhibitorsMax, config_parse_uint64, 0, offsetof(Manager, inhibitors_max) Login.SessionsMax, config_parse_uint64, 0, offsetof(Manager, sessions_max) Login.UserTasksMax, config_parse_user_tasks_max,0, offsetof(Manager, user_tasks_max) +#if 1 /// Additions for elogind Sleep.SuspendMode, config_parse_strv, 0, offsetof(Manager, suspend_mode) Sleep.SuspendState, config_parse_strv, 0, offsetof(Manager, suspend_state) Sleep.HibernateMode, config_parse_strv, 0, offsetof(Manager, hibernate_mode) Sleep.HibernateState, config_parse_strv, 0, offsetof(Manager, hibernate_state) Sleep.HybridSleepMode, config_parse_strv, 0, offsetof(Manager, hybrid_sleep_mode) Sleep.HybridSleepState, config_parse_strv, 0, offsetof(Manager, hybrid_sleep_state) +#endif // 1 -- 2.30.2