From 503e27ed6b839cc7a9a3a1c5e10e659a98c25939 Mon Sep 17 00:00:00 2001 From: gmpinder Date: Sun, 4 Jun 2023 12:23:13 -0400 Subject: [PATCH] Install xboxdrv into /usr/bin --- Containerfile | 8 ++++---- .../etc/udev/rules.d/99-8bitdo-ultimate-xinput.rules | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename usr/{local => }/etc/udev/rules.d/99-8bitdo-ultimate-xinput.rules (100%) diff --git a/Containerfile b/Containerfile index 83f451a..0052d94 100644 --- a/Containerfile +++ b/Containerfile @@ -31,7 +31,7 @@ ARG RECIPE=./recipe.yml # See issue #28 (https://github.com/ublue-os/startingpoint/issues/28). COPY usr/bin /usr/bin COPY usr/lib /usr/lib -COPY usr/local /usr/local +COPY usr/etc /usr/etc COPY usr/share /usr/share # Copy the recipe that we're building. @@ -45,9 +45,9 @@ COPY --from=docker.io/mikefarah/yq /usr/bin/yq /usr/bin/yq COPY --from=gcr.io/projectsigstore/cosign /ko-app/cosign /usr/bin/cosign # Install xboxdrv for the Xbox 360 controller. -COPY --from=xboxdrv-bin /usr/local/bin/xboxdrv /usr/local/bin/xboxdrv -COPY --from=xboxdrv-bin /usr/local/bin/xboxdrvctl /usr/local/bin/xboxdrvctl -COPY --from=xboxdrv-bin /usr/local/share/man/man1/xboxdrv.1 /usr/local/share/man/man1/xboxdrv.1 +COPY --from=xboxdrv-bin /usr/local/bin/xboxdrv /usr/bin/xboxdrv +COPY --from=xboxdrv-bin /usr/local/bin/xboxdrvctl /usr/bin/xboxdrvctl +COPY --from=xboxdrv-bin /usr/local/share/man/man1/xboxdrv.1 /usr/share/man/man1/xboxdrv.1 # Copy the build script and all custom scripts. COPY scripts /tmp/scripts diff --git a/usr/local/etc/udev/rules.d/99-8bitdo-ultimate-xinput.rules b/usr/etc/udev/rules.d/99-8bitdo-ultimate-xinput.rules similarity index 100% rename from usr/local/etc/udev/rules.d/99-8bitdo-ultimate-xinput.rules rename to usr/etc/udev/rules.d/99-8bitdo-ultimate-xinput.rules