From f76b30008f1a00492a535cbd6f133b55ec638c37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amadeusz=20Piotr=20=C5=BBo=C5=82nowski?= Date: Sat, 14 Dec 2019 19:02:25 +0000 Subject: [PATCH] Merge `app-defaults` and `sys-defaults` to `config-overrides` --- app-defaults/Makefile | 11 ----------- boot/redhat/Makefile | 3 ++- ...nome.desktop.wm.preferences.qubes.gschema.override | 0 .../20_org.gnome.nautilus.qubes.gschema.override | 0 ...ings-daemon.plugins.updates.qubes.gschema.override | 0 ...org.mate.NotificationDaemon.qubes.gschema.override | 0 .../20_tcp_timestamps.conf | 0 {sys-defaults => config-overrides}/Makefile | 8 ++++++++ {sys-defaults => config-overrides}/dconf-db-local-dpi | 0 .../profile.d_qt_x11_no_mitshm.sh | 0 .../sudoers.d_qt_x11_no_mitshm | 0 {sys-defaults => config-overrides}/sudoers.d_umask | 0 debian/rules | 3 +-- misc/Makefile | 3 ++- rpm_spec/core-agent.spec.in | 3 +-- 15 files changed, 14 insertions(+), 17 deletions(-) delete mode 100644 app-defaults/Makefile rename {app-defaults => config-overrides}/20_org.gnome.desktop.wm.preferences.qubes.gschema.override (100%) rename {app-defaults => config-overrides}/20_org.gnome.nautilus.qubes.gschema.override (100%) rename {app-defaults => config-overrides}/20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override (100%) rename {app-defaults => config-overrides}/20_org.mate.NotificationDaemon.qubes.gschema.override (100%) rename {sys-defaults => config-overrides}/20_tcp_timestamps.conf (100%) rename {sys-defaults => config-overrides}/Makefile (59%) rename {sys-defaults => config-overrides}/dconf-db-local-dpi (100%) rename {sys-defaults => config-overrides}/profile.d_qt_x11_no_mitshm.sh (100%) rename {sys-defaults => config-overrides}/sudoers.d_qt_x11_no_mitshm (100%) rename {sys-defaults => config-overrides}/sudoers.d_umask (100%) diff --git a/app-defaults/Makefile b/app-defaults/Makefile deleted file mode 100644 index 35e2d9d..0000000 --- a/app-defaults/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -GLIBSCHEMAS ?= /usr/share/glib-2.0/schemas - -.PHONY: install - -install: - install -d $(DESTDIR)$(GLIBSCHEMAS) - install -t $(DESTDIR)$(GLIBSCHEMAS) -m 0644 \ - 20_org.gnome.desktop.wm.preferences.qubes.gschema.override \ - 20_org.gnome.nautilus.qubes.gschema.override \ - 20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override \ - 20_org.mate.NotificationDaemon.qubes.gschema.override diff --git a/boot/redhat/Makefile b/boot/redhat/Makefile index c4f6417..cd8a88b 100644 --- a/boot/redhat/Makefile +++ b/boot/redhat/Makefile @@ -1,7 +1,8 @@ +DATADIR ?= /usr/share LIBDIR ?= /usr/lib SBINDIR ?= /usr/sbin SYSCONFDIR ?= /etc -QUBESDATADIR = /usr/share/qubes +QUBESDATADIR = $(DATADIR)/qubes .PHONY: install diff --git a/app-defaults/20_org.gnome.desktop.wm.preferences.qubes.gschema.override b/config-overrides/20_org.gnome.desktop.wm.preferences.qubes.gschema.override similarity index 100% rename from app-defaults/20_org.gnome.desktop.wm.preferences.qubes.gschema.override rename to config-overrides/20_org.gnome.desktop.wm.preferences.qubes.gschema.override diff --git a/app-defaults/20_org.gnome.nautilus.qubes.gschema.override b/config-overrides/20_org.gnome.nautilus.qubes.gschema.override similarity index 100% rename from app-defaults/20_org.gnome.nautilus.qubes.gschema.override rename to config-overrides/20_org.gnome.nautilus.qubes.gschema.override diff --git a/app-defaults/20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override b/config-overrides/20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override similarity index 100% rename from app-defaults/20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override rename to config-overrides/20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override diff --git a/app-defaults/20_org.mate.NotificationDaemon.qubes.gschema.override b/config-overrides/20_org.mate.NotificationDaemon.qubes.gschema.override similarity index 100% rename from app-defaults/20_org.mate.NotificationDaemon.qubes.gschema.override rename to config-overrides/20_org.mate.NotificationDaemon.qubes.gschema.override diff --git a/sys-defaults/20_tcp_timestamps.conf b/config-overrides/20_tcp_timestamps.conf similarity index 100% rename from sys-defaults/20_tcp_timestamps.conf rename to config-overrides/20_tcp_timestamps.conf diff --git a/sys-defaults/Makefile b/config-overrides/Makefile similarity index 59% rename from sys-defaults/Makefile rename to config-overrides/Makefile index 35be689..2cabde7 100644 --- a/sys-defaults/Makefile +++ b/config-overrides/Makefile @@ -1,3 +1,5 @@ +DATADIR ?= /usr/share +GLIBSCHEMAS ?= $(DATADIR)/glib-2.0/schemas SYSCONFDIR ?= /etc SUDOERSDIR = $(SYSCONFDIR)/sudoers.d @@ -10,3 +12,9 @@ install: install -D -m 0440 sudoers.d_umask $(DESTDIR)$(SUDOERSDIR)/umask install -D -m 0644 20_tcp_timestamps.conf $(DESTDIR)$(SYSCONFDIR)/sysctl.d/20_tcp_timestamps.conf install -D -m 0644 dconf-db-local-dpi $(DESTDIR)$(SYSCONFDIR)/dconf/db/local.d/dpi + install -d $(DESTDIR)$(GLIBSCHEMAS) + install -t $(DESTDIR)$(GLIBSCHEMAS) -m 0644 \ + 20_org.gnome.desktop.wm.preferences.qubes.gschema.override \ + 20_org.gnome.nautilus.qubes.gschema.override \ + 20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override \ + 20_org.mate.NotificationDaemon.qubes.gschema.override diff --git a/sys-defaults/dconf-db-local-dpi b/config-overrides/dconf-db-local-dpi similarity index 100% rename from sys-defaults/dconf-db-local-dpi rename to config-overrides/dconf-db-local-dpi diff --git a/sys-defaults/profile.d_qt_x11_no_mitshm.sh b/config-overrides/profile.d_qt_x11_no_mitshm.sh similarity index 100% rename from sys-defaults/profile.d_qt_x11_no_mitshm.sh rename to config-overrides/profile.d_qt_x11_no_mitshm.sh diff --git a/sys-defaults/sudoers.d_qt_x11_no_mitshm b/config-overrides/sudoers.d_qt_x11_no_mitshm similarity index 100% rename from sys-defaults/sudoers.d_qt_x11_no_mitshm rename to config-overrides/sudoers.d_qt_x11_no_mitshm diff --git a/sys-defaults/sudoers.d_umask b/config-overrides/sudoers.d_umask similarity index 100% rename from sys-defaults/sudoers.d_umask rename to config-overrides/sudoers.d_umask diff --git a/debian/rules b/debian/rules index c3262ac..93e61fe 100755 --- a/debian/rules +++ b/debian/rules @@ -16,8 +16,8 @@ override_dh_auto_build: override_dh_auto_install: make install-deb - make -C app-defaults install make -C app-menu install + make -C config-overrides install make -C filesystem install make -C misc install make -C network install @@ -25,7 +25,6 @@ override_dh_auto_install: make -C package-managers install-apt make -C passwordless-root install make -C passwordless-root/debian install - make -C sys-defaults install make -C qubes-rpc install make -C qubes-rpc/kde install make -C qubes-rpc/nautilus install diff --git a/misc/Makefile b/misc/Makefile index aeb7d5b..8465d7c 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -1,7 +1,8 @@ BINDIR ?= /usr/bin +DATADIR ?= /usr/share SYSCONFDIR ?= /etc UDEVRULESDIR = $(SYSCONFDIR)/udev/rules.d -QUBESDATADIR = /usr/share/qubes +QUBESDATADIR = $(DATADIR)/qubes .PHONY: all clean install diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in index 7b9054c..9a9d8cd 100644 --- a/rpm_spec/core-agent.spec.in +++ b/rpm_spec/core-agent.spec.in @@ -291,14 +291,13 @@ usermod -p '' root %install make install-vm DESTDIR=$RPM_BUILD_ROOT -make -C app-defaults DESTDIR=$RPM_BUILD_ROOT install make -C app-menu DESTDIR=$RPM_BUILD_ROOT install make -C boot/redhat DESTDIR=$RPM_BUILD_ROOT install +make -C config-overrides DESTDIR=$RPM_BUILD_ROOT install make -C filesystem DESTDIR=$RPM_BUILD_ROOT install make -C misc DESTDIR=$RPM_BUILD_ROOT install make -C network DESTDIR=$RPM_BUILD_ROOT install make -C passwordless-root DESTDIR=$RPM_BUILD_ROOT install -make -C sys-defaults DESTDIR=$RPM_BUILD_ROOT install make -C qubes-rpc DESTDIR=$RPM_BUILD_ROOT install make -C qubes-rpc/kde DESTDIR=$RPM_BUILD_ROOT install make -C qubes-rpc/nautilus DESTDIR=$RPM_BUILD_ROOT install