Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge app-defaults and sys-defaults to config-overrides

Browse Source
This commit is contained in:
Amadeusz Piotr Żołnowski 2019-12-14 19:02:25 +00:00
parent dee84452aa
commit f76b30008f
No known key found for this signature in database
GPG Key ID: CBCC8023F59E1704
15 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app-defaults/Makefile
View File

@ -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

3
boot/redhat/Makefile
View File

@ -1,7 +1,8 @@
DATADIR ?= /usr/share
LIBDIR ?= /usr/lib LIBDIR ?= /usr/lib
SBINDIR ?= /usr/sbin SBINDIR ?= /usr/sbin
SYSCONFDIR ?= /etc SYSCONFDIR ?= /etc
QUBESDATADIR = /usr/share/qubes QUBESDATADIR = $(DATADIR)/qubes
.PHONY: install .PHONY: install

0
app-defaults/20_org.gnome.desktop.wm.preferences.qubes.gschema.override → config-overrides/20_org.gnome.desktop.wm.preferences.qubes.gschema.override
View File

0
app-defaults/20_org.gnome.nautilus.qubes.gschema.override → config-overrides/20_org.gnome.nautilus.qubes.gschema.override
View File

0
app-defaults/20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override → config-overrides/20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override
View File

0
app-defaults/20_org.mate.NotificationDaemon.qubes.gschema.override → config-overrides/20_org.mate.NotificationDaemon.qubes.gschema.override
View File

0
sys-defaults/20_tcp_timestamps.conf → config-overrides/20_tcp_timestamps.conf
View File

8
sys-defaults/Makefile → config-overrides/Makefile
View File

@ -1,3 +1,5 @@
DATADIR ?= /usr/share
GLIBSCHEMAS ?= $(DATADIR)/glib-2.0/schemas
SYSCONFDIR ?= /etc SYSCONFDIR ?= /etc
SUDOERSDIR = $(SYSCONFDIR)/sudoers.d SUDOERSDIR = $(SYSCONFDIR)/sudoers.d
@ -10,3 +12,9 @@ install:
install -D -m 0440 sudoers.d_umask $(DESTDIR)$(SUDOERSDIR)/umask 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 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 -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

0
sys-defaults/dconf-db-local-dpi → config-overrides/dconf-db-local-dpi
View File

0
sys-defaults/profile.d_qt_x11_no_mitshm.sh → config-overrides/profile.d_qt_x11_no_mitshm.sh
View File

0
sys-defaults/sudoers.d_qt_x11_no_mitshm → config-overrides/sudoers.d_qt_x11_no_mitshm
View File

0
sys-defaults/sudoers.d_umask → config-overrides/sudoers.d_umask
View File

3
debian/rules vendored
View File

@ -16,8 +16,8 @@ override_dh_auto_build:
override_dh_auto_install: override_dh_auto_install:
make install-deb make install-deb
make -C app-defaults install
make -C app-menu install make -C app-menu install
make -C config-overrides install
make -C filesystem install make -C filesystem install
make -C misc install make -C misc install
make -C network install make -C network install
@ -25,7 +25,6 @@ override_dh_auto_install:
make -C package-managers install-apt make -C package-managers install-apt
make -C passwordless-root install make -C passwordless-root install
make -C passwordless-root/debian install make -C passwordless-root/debian install
make -C sys-defaults install
make -C qubes-rpc install make -C qubes-rpc install
make -C qubes-rpc/kde install make -C qubes-rpc/kde install
make -C qubes-rpc/nautilus install make -C qubes-rpc/nautilus install

3
misc/Makefile
View File

@ -1,7 +1,8 @@
BINDIR ?= /usr/bin BINDIR ?= /usr/bin
DATADIR ?= /usr/share
SYSCONFDIR ?= /etc SYSCONFDIR ?= /etc
UDEVRULESDIR = $(SYSCONFDIR)/udev/rules.d UDEVRULESDIR = $(SYSCONFDIR)/udev/rules.d
QUBESDATADIR = /usr/share/qubes QUBESDATADIR = $(DATADIR)/qubes
.PHONY: all clean install .PHONY: all clean install

3
rpm_spec/core-agent.spec.in
View File

@ -291,14 +291,13 @@ usermod -p '' root
%install %install
make install-vm DESTDIR=$RPM_BUILD_ROOT 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 app-menu DESTDIR=$RPM_BUILD_ROOT install
make -C boot/redhat 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 filesystem DESTDIR=$RPM_BUILD_ROOT install
make -C misc DESTDIR=$RPM_BUILD_ROOT install make -C misc DESTDIR=$RPM_BUILD_ROOT install
make -C network DESTDIR=$RPM_BUILD_ROOT install make -C network DESTDIR=$RPM_BUILD_ROOT install
make -C passwordless-root 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 DESTDIR=$RPM_BUILD_ROOT install
make -C qubes-rpc/kde 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 make -C qubes-rpc/nautilus DESTDIR=$RPM_BUILD_ROOT install