Skip to content

Move all binaries from /usr/sbin to /usr/bin #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marmarek merged 2 commits into from
Mar 3, 2025
Merged

Move all binaries from /usr/sbin to /usr/bin #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
658ce33
Move all binaries from /usr/sbin to /usr/bin
marmarek Mar 1, 2025
df97973
ci: add R4.3
marmarek Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,11 @@ include:
project: QubesOS/qubes-continuous-integration
- file: /r4.2/gitlab-vm.yml
project: QubesOS/qubes-continuous-integration
- file: /r4.3/gitlab-base.yml
project: QubesOS/qubes-continuous-integration
# - file: /r4.3/gitlab-host-qwt.yml
# project: QubesOS/qubes-continuous-integration
Comment on lines +12 to +13

@DemiMarie DemiMarie Mar 3, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this present but commented out? 😕

@marmarek marmarek Mar 3, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be uncommented when QWT tests in CI will be back.

- file: /r4.3/gitlab-host.yml
project: QubesOS/qubes-continuous-integration
- file: /r4.3/gitlab-vm.yml
project: QubesOS/qubes-continuous-integration
6 changes: 3 additions & 3 deletions daemon/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ LIBS += -L$(QUBES_LIBS) -lvchan
endif
CFLAGS += -DBACKEND_VMM_$(BACKEND_VMM)

SBINDIR ?= /usr/sbin
BINDIR ?= /usr/bin

all: qubesdb-daemon$(EXEEXT)

install:
install -d $(DESTDIR)$(SBINDIR)
install qubesdb-daemon$(EXEEXT) $(DESTDIR)$(SBINDIR)/
install -d $(DESTDIR)$(BINDIR)
install qubesdb-daemon$(EXEEXT) $(DESTDIR)$(BINDIR)/

qubesdb-daemon$(EXEEXT): db-cmds.o db-daemon.o db-core.o buffer.o
$(CC) $(LDFLAGS) -o $@ $^ $(APPEND_LDFLAGS) $(LIBS)
Expand Down
2 changes: 1 addition & 1 deletion daemon/qubes-db-dom0.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ After=systemd-tmpfiles-setup.service

[Service]
# Both agent and daemon for dom0
ExecStart=/usr/sbin/qubesdb-daemon 0 dom0
ExecStart=/usr/bin/qubesdb-daemon 0 dom0
Type=notify
StandardOutput=syslog

Expand Down
2 changes: 1 addition & 1 deletion daemon/qubes-db.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ DefaultDependencies=no

[Service]
# Remote Dom ID as an argument
ExecStart=/usr/sbin/qubesdb-daemon 0
ExecStart=/usr/bin/qubesdb-daemon 0
Type=notify
Group=qubes

Expand Down
2 changes: 1 addition & 1 deletion debian/qubesdb.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ usr/bin/qubesdb-rm
usr/bin/qubesdb-multiread
usr/bin/qubesdb-list
usr/bin/qubesdb-watch
usr/sbin/qubesdb-daemon
usr/bin/qubesdb-daemon
7 changes: 7 additions & 0 deletions rpm_spec/qubes-db.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ make install \
LIBDIR=%{_libdir} \
BINDIR=%{_bindir} \
SBINDIR=%{_sbindir}
%if "%{_sbindir}" != "%{_bindir}"
mkdir -p %{buildroot}%{_sbindir}
ln -s ../bin/qubesdb-daemon %{buildroot}%{_sbindir}/qubesdb-daemon
%endif

%files
%doc
Expand All @@ -89,7 +93,10 @@ make install \
%{_bindir}/qubesdb-multiread
%{_bindir}/qubesdb-list
%{_bindir}/qubesdb-watch
%{_bindir}/qubesdb-daemon
%if "%{_sbindir}" != "%{_bindir}"
%{_sbindir}/qubesdb-daemon
%endif

%files libs
%{_libdir}/libqubesdb.so
Expand Down
1 change: 0 additions & 1 deletion selinux/qubes-core-qubesdb.fc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/usr/sbin/qubesdb-daemon -- gen_context(system_u:object_r:qubes_qubesdb_daemon_exec_t,s0)
/usr/bin/qubesdb-daemon -- gen_context(system_u:object_r:qubes_qubesdb_daemon_exec_t,s0)
/run/qubes/qubesdb\.sock -s gen_context(system_u:object_r:qubes_qubesdb_socket_t,s0)
/var/run/qubes/qubesdb\.sock -s gen_context(system_u:object_r:qubes_qubesdb_socket_t,s0)