From a4ea430767f813798194b951ddae4620860f0c03 Mon Sep 17 00:00:00 2001 From: Daniel Stiner Date: Sun, 28 Jan 2018 21:23:38 -0800 Subject: [PATCH] Separate linux-specific components (#18) Both makes the project cleaner and allows targeting Mac OS / Windows sometime in the future * Move linux-specific files into sub-directory * Patch up paths in various files to reflect moves * Modify travis.yml to invoke linux Docker file from repo root --- .bumpversion.cfg | 12 ++++++------ .travis.yml | 2 +- Cargo.toml => linux/Cargo.toml | 2 +- Dockerfile => linux/Dockerfile | 9 +++------ Makefile => linux/Makefile | 0 {debian => linux/debian}/README | 0 {debian => linux/debian}/changelog | 0 {debian => linux/debian}/compat | 0 {debian => linux/debian}/control | 0 {debian => linux/debian}/copyright | 0 {debian => linux/debian}/rules | 0 {debian => linux/debian}/softu2f-docs.docs | 0 {debian => linux/debian}/source/format | 0 softu2f.spec => linux/softu2f.spec | 0 {system-daemon => linux/system-daemon}/Cargo.toml | 4 ++-- {system-daemon => linux/system-daemon}/Makefile | 0 {system-daemon => linux/system-daemon}/build.rs | 0 .../system-daemon}/maintainer-scripts/postinst | 0 .../system-daemon}/maintainer-scripts/prerm | 0 .../system-daemon}/protos/socket.proto | 0 .../system-daemon}/selinux-policy/Makefile | 0 .../selinux-policy/softu2f-system-daemon-selinux.8 | 0 .../softu2f-system-daemon-selinux.spec | 0 .../selinux-policy/softu2f-system-daemon.fc | 0 .../selinux-policy/softu2f-system-daemon.if | 0 .../selinux-policy/softu2f-system-daemon.sh | 0 .../selinux-policy/softu2f-system-daemon.te | 0 .../system-daemon}/softu2f-system-daemon.spec | 0 .../system-daemon}/softu2f-tmpfiles.conf | 0 .../system-daemon}/softu2f.preset | 0 .../system-daemon}/softu2f.service | 0 .../system-daemon}/softu2f.socket | 0 .../system-daemon}/src/bidirectional_pipe.rs | 0 {system-daemon => linux/system-daemon}/src/codec.rs | 0 .../system-daemon}/src/definitions.rs | 0 {system-daemon => linux/system-daemon}/src/device.rs | 0 {system-daemon => linux/system-daemon}/src/lib.rs | 0 {system-daemon => linux/system-daemon}/src/main.rs | 0 {system-daemon => linux/system-daemon}/src/proto.rs | 0 .../system-daemon}/src/sequential_stream.rs | 0 {linux-uhid-sys => linux/uhid-sys}/Cargo.toml | 0 {linux-uhid-sys => linux/uhid-sys}/build.rs | 0 {linux-uhid-sys => linux/uhid-sys}/src/lib.rs | 0 {linux-uhid-sys => linux/uhid-sys}/wrapper.h | 0 {linux-uhid-tokio => linux/uhid-tokio}/Cargo.toml | 2 +- .../uhid-tokio}/example/.gitignore | 0 .../uhid-tokio}/example/Cargo.toml | 0 .../uhid-tokio}/example/src/main.rs | 0 .../uhid-tokio}/src/character_device.rs | 0 .../uhid-tokio}/src/character_device_file.rs | 0 {linux-uhid-tokio => linux/uhid-tokio}/src/lib.rs | 0 .../uhid-tokio}/src/poll_evented_read_wrapper.rs | 0 .../uhid-tokio}/src/uhid_codec.rs | 0 .../uhid-tokio}/src/uhid_device.rs | 0 .../uhid-tokio}/test/generate-uhid-requests.c | 0 {user-daemon => linux/user-daemon}/Cargo.toml | 4 ++-- {user-daemon => linux/user-daemon}/Makefile | 0 .../user-daemon}/maintainer-scripts/postinst | 0 .../user-daemon}/maintainer-scripts/prerm | 0 .../user-daemon}/softu2f-user-daemon.spec | 0 {user-daemon => linux/user-daemon}/softu2f.preset | 0 {user-daemon => linux/user-daemon}/softu2f.service | 0 {user-daemon => linux/user-daemon}/src/file_store.rs | 0 {user-daemon => linux/user-daemon}/src/main.rs | 0 .../user-daemon}/src/user_presence.rs | 0 65 files changed, 16 insertions(+), 19 deletions(-) rename Cargo.toml => linux/Cargo.toml (55%) rename Dockerfile => linux/Dockerfile (51%) rename Makefile => linux/Makefile (100%) rename {debian => linux/debian}/README (100%) rename {debian => linux/debian}/changelog (100%) rename {debian => linux/debian}/compat (100%) rename {debian => linux/debian}/control (100%) rename {debian => linux/debian}/copyright (100%) rename {debian => linux/debian}/rules (100%) rename {debian => linux/debian}/softu2f-docs.docs (100%) rename {debian => linux/debian}/source/format (100%) rename softu2f.spec => linux/softu2f.spec (100%) rename {system-daemon => linux/system-daemon}/Cargo.toml (95%) rename {system-daemon => linux/system-daemon}/Makefile (100%) rename {system-daemon => linux/system-daemon}/build.rs (100%) rename {system-daemon => linux/system-daemon}/maintainer-scripts/postinst (100%) rename {system-daemon => linux/system-daemon}/maintainer-scripts/prerm (100%) rename {system-daemon => linux/system-daemon}/protos/socket.proto (100%) rename {system-daemon => linux/system-daemon}/selinux-policy/Makefile (100%) rename {system-daemon => linux/system-daemon}/selinux-policy/softu2f-system-daemon-selinux.8 (100%) rename {system-daemon => linux/system-daemon}/selinux-policy/softu2f-system-daemon-selinux.spec (100%) rename {system-daemon => linux/system-daemon}/selinux-policy/softu2f-system-daemon.fc (100%) rename {system-daemon => linux/system-daemon}/selinux-policy/softu2f-system-daemon.if (100%) rename {system-daemon => linux/system-daemon}/selinux-policy/softu2f-system-daemon.sh (100%) rename {system-daemon => linux/system-daemon}/selinux-policy/softu2f-system-daemon.te (100%) rename {system-daemon => linux/system-daemon}/softu2f-system-daemon.spec (100%) rename {system-daemon => linux/system-daemon}/softu2f-tmpfiles.conf (100%) rename {system-daemon => linux/system-daemon}/softu2f.preset (100%) rename {system-daemon => linux/system-daemon}/softu2f.service (100%) rename {system-daemon => linux/system-daemon}/softu2f.socket (100%) rename {system-daemon => linux/system-daemon}/src/bidirectional_pipe.rs (100%) rename {system-daemon => linux/system-daemon}/src/codec.rs (100%) rename {system-daemon => linux/system-daemon}/src/definitions.rs (100%) rename {system-daemon => linux/system-daemon}/src/device.rs (100%) rename {system-daemon => linux/system-daemon}/src/lib.rs (100%) rename {system-daemon => linux/system-daemon}/src/main.rs (100%) rename {system-daemon => linux/system-daemon}/src/proto.rs (100%) rename {system-daemon => linux/system-daemon}/src/sequential_stream.rs (100%) rename {linux-uhid-sys => linux/uhid-sys}/Cargo.toml (100%) rename {linux-uhid-sys => linux/uhid-sys}/build.rs (100%) rename {linux-uhid-sys => linux/uhid-sys}/src/lib.rs (100%) rename {linux-uhid-sys => linux/uhid-sys}/wrapper.h (100%) rename {linux-uhid-tokio => linux/uhid-tokio}/Cargo.toml (92%) rename {linux-uhid-tokio => linux/uhid-tokio}/example/.gitignore (100%) rename {linux-uhid-tokio => linux/uhid-tokio}/example/Cargo.toml (100%) rename {linux-uhid-tokio => linux/uhid-tokio}/example/src/main.rs (100%) rename {linux-uhid-tokio => linux/uhid-tokio}/src/character_device.rs (100%) rename {linux-uhid-tokio => linux/uhid-tokio}/src/character_device_file.rs (100%) rename {linux-uhid-tokio => linux/uhid-tokio}/src/lib.rs (100%) rename {linux-uhid-tokio => linux/uhid-tokio}/src/poll_evented_read_wrapper.rs (100%) rename {linux-uhid-tokio => linux/uhid-tokio}/src/uhid_codec.rs (100%) rename {linux-uhid-tokio => linux/uhid-tokio}/src/uhid_device.rs (100%) rename {linux-uhid-tokio => linux/uhid-tokio}/test/generate-uhid-requests.c (100%) rename {user-daemon => linux/user-daemon}/Cargo.toml (95%) rename {user-daemon => linux/user-daemon}/Makefile (100%) rename {user-daemon => linux/user-daemon}/maintainer-scripts/postinst (100%) rename {user-daemon => linux/user-daemon}/maintainer-scripts/prerm (100%) rename {user-daemon => linux/user-daemon}/softu2f-user-daemon.spec (100%) rename {user-daemon => linux/user-daemon}/softu2f.preset (100%) rename {user-daemon => linux/user-daemon}/softu2f.service (100%) rename {user-daemon => linux/user-daemon}/src/file_store.rs (100%) rename {user-daemon => linux/user-daemon}/src/main.rs (100%) rename {user-daemon => linux/user-daemon}/src/user_presence.rs (100%) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index d41be39..edef370 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -3,11 +3,11 @@ current_version = 0.2.0 commit = True tag = True -[bumpversion:file:system-daemon/Cargo.toml] +[bumpversion:file:linux/system-daemon/Cargo.toml] search = version = "{current_version}" replace = version = "{new_version}" -[bumpversion:file:system-daemon/softu2f-system-daemon.spec] +[bumpversion:file:linux/system-daemon/softu2f-system-daemon.spec] search = Version: {current_version} replace = Version: {new_version} @@ -19,19 +19,19 @@ replace = version = "{new_version}" search = version = "{current_version}" replace = version = "{new_version}" -[bumpversion:file:linux-uhid-tokio/Cargo.toml] +[bumpversion:file:linux/uhid-tokio/Cargo.toml] search = version = "{current_version}" replace = version = "{new_version}" -[bumpversion:file:user-daemon/Cargo.toml] +[bumpversion:file:linux/user-daemon/Cargo.toml] search = version = "{current_version}" replace = version = "{new_version}" -[bumpversion:file:user-daemon/softu2f-user-daemon.spec] +[bumpversion:file:linux/user-daemon/softu2f-user-daemon.spec] search = Version: {current_version} replace = Version: {new_version} -[bumpversion:file:softu2f.spec] +[bumpversion:file:linux/softu2f.spec] search = Version: {current_version} replace = Version: {new_version} diff --git a/.travis.yml b/.travis.yml index 20e680a..365ea68 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ services: - docker before_install: -- docker build -t danstiner/softu2f-linux . +- docker build -t danstiner/softu2f-linux -f linux/Dockerfile . script: - docker run -t danstiner/softu2f-linux cargo test --all diff --git a/Cargo.toml b/linux/Cargo.toml similarity index 55% rename from Cargo.toml rename to linux/Cargo.toml index 2bebd8a..03a2f6b 100644 --- a/Cargo.toml +++ b/linux/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -members = ["u2f-core", "u2fhid-protocol", "linux-uhid-sys", "linux-uhid-tokio", "linux-uhid-tokio/example", "user-daemon", "system-daemon"] +members = ["uhid-sys", "uhid-tokio", "uhid-tokio/example", "user-daemon", "system-daemon"] [profile.release] lto = true diff --git a/Dockerfile b/linux/Dockerfile similarity index 51% rename from Dockerfile rename to linux/Dockerfile index 8a84e9c..929f961 100644 --- a/Dockerfile +++ b/linux/Dockerfile @@ -1,9 +1,6 @@ +# Run from repository root, for example: `docker build -t danstiner/softu2f-linux -f linux/Dockerfile .` FROM rust:latest - RUN apt-get update && apt-get install -y clang-3.9 libdbus-1-dev libssl-dev libsystemd-dev protobuf-compiler - -WORKDIR /app -COPY . . - +COPY . /app +WORKDIR /app/linux RUN cargo build - diff --git a/Makefile b/linux/Makefile similarity index 100% rename from Makefile rename to linux/Makefile diff --git a/debian/README b/linux/debian/README similarity index 100% rename from debian/README rename to linux/debian/README diff --git a/debian/changelog b/linux/debian/changelog similarity index 100% rename from debian/changelog rename to linux/debian/changelog diff --git a/debian/compat b/linux/debian/compat similarity index 100% rename from debian/compat rename to linux/debian/compat diff --git a/debian/control b/linux/debian/control similarity index 100% rename from debian/control rename to linux/debian/control diff --git a/debian/copyright b/linux/debian/copyright similarity index 100% rename from debian/copyright rename to linux/debian/copyright diff --git a/debian/rules b/linux/debian/rules similarity index 100% rename from debian/rules rename to linux/debian/rules diff --git a/debian/softu2f-docs.docs b/linux/debian/softu2f-docs.docs similarity index 100% rename from debian/softu2f-docs.docs rename to linux/debian/softu2f-docs.docs diff --git a/debian/source/format b/linux/debian/source/format similarity index 100% rename from debian/source/format rename to linux/debian/source/format diff --git a/softu2f.spec b/linux/softu2f.spec similarity index 100% rename from softu2f.spec rename to linux/softu2f.spec diff --git a/system-daemon/Cargo.toml b/linux/system-daemon/Cargo.toml similarity index 95% rename from system-daemon/Cargo.toml rename to linux/system-daemon/Cargo.toml index a73be6b..f4fc6fc 100644 --- a/system-daemon/Cargo.toml +++ b/linux/system-daemon/Cargo.toml @@ -27,10 +27,10 @@ tokio-uds = "0.1.7" users = "0.6.0" [dependencies.linux-uhid-tokio] -path = "../linux-uhid-tokio" +path = "../uhid-tokio" [dependencies.u2fhid-protocol] -path = "../u2fhid-protocol/" +path = "../../u2fhid-protocol/" [[bin]] name = "softu2f-system-daemon" diff --git a/system-daemon/Makefile b/linux/system-daemon/Makefile similarity index 100% rename from system-daemon/Makefile rename to linux/system-daemon/Makefile diff --git a/system-daemon/build.rs b/linux/system-daemon/build.rs similarity index 100% rename from system-daemon/build.rs rename to linux/system-daemon/build.rs diff --git a/system-daemon/maintainer-scripts/postinst b/linux/system-daemon/maintainer-scripts/postinst similarity index 100% rename from system-daemon/maintainer-scripts/postinst rename to linux/system-daemon/maintainer-scripts/postinst diff --git a/system-daemon/maintainer-scripts/prerm b/linux/system-daemon/maintainer-scripts/prerm similarity index 100% rename from system-daemon/maintainer-scripts/prerm rename to linux/system-daemon/maintainer-scripts/prerm diff --git a/system-daemon/protos/socket.proto b/linux/system-daemon/protos/socket.proto similarity index 100% rename from system-daemon/protos/socket.proto rename to linux/system-daemon/protos/socket.proto diff --git a/system-daemon/selinux-policy/Makefile b/linux/system-daemon/selinux-policy/Makefile similarity index 100% rename from system-daemon/selinux-policy/Makefile rename to linux/system-daemon/selinux-policy/Makefile diff --git a/system-daemon/selinux-policy/softu2f-system-daemon-selinux.8 b/linux/system-daemon/selinux-policy/softu2f-system-daemon-selinux.8 similarity index 100% rename from system-daemon/selinux-policy/softu2f-system-daemon-selinux.8 rename to linux/system-daemon/selinux-policy/softu2f-system-daemon-selinux.8 diff --git a/system-daemon/selinux-policy/softu2f-system-daemon-selinux.spec b/linux/system-daemon/selinux-policy/softu2f-system-daemon-selinux.spec similarity index 100% rename from system-daemon/selinux-policy/softu2f-system-daemon-selinux.spec rename to linux/system-daemon/selinux-policy/softu2f-system-daemon-selinux.spec diff --git a/system-daemon/selinux-policy/softu2f-system-daemon.fc b/linux/system-daemon/selinux-policy/softu2f-system-daemon.fc similarity index 100% rename from system-daemon/selinux-policy/softu2f-system-daemon.fc rename to linux/system-daemon/selinux-policy/softu2f-system-daemon.fc diff --git a/system-daemon/selinux-policy/softu2f-system-daemon.if b/linux/system-daemon/selinux-policy/softu2f-system-daemon.if similarity index 100% rename from system-daemon/selinux-policy/softu2f-system-daemon.if rename to linux/system-daemon/selinux-policy/softu2f-system-daemon.if diff --git a/system-daemon/selinux-policy/softu2f-system-daemon.sh b/linux/system-daemon/selinux-policy/softu2f-system-daemon.sh similarity index 100% rename from system-daemon/selinux-policy/softu2f-system-daemon.sh rename to linux/system-daemon/selinux-policy/softu2f-system-daemon.sh diff --git a/system-daemon/selinux-policy/softu2f-system-daemon.te b/linux/system-daemon/selinux-policy/softu2f-system-daemon.te similarity index 100% rename from system-daemon/selinux-policy/softu2f-system-daemon.te rename to linux/system-daemon/selinux-policy/softu2f-system-daemon.te diff --git a/system-daemon/softu2f-system-daemon.spec b/linux/system-daemon/softu2f-system-daemon.spec similarity index 100% rename from system-daemon/softu2f-system-daemon.spec rename to linux/system-daemon/softu2f-system-daemon.spec diff --git a/system-daemon/softu2f-tmpfiles.conf b/linux/system-daemon/softu2f-tmpfiles.conf similarity index 100% rename from system-daemon/softu2f-tmpfiles.conf rename to linux/system-daemon/softu2f-tmpfiles.conf diff --git a/system-daemon/softu2f.preset b/linux/system-daemon/softu2f.preset similarity index 100% rename from system-daemon/softu2f.preset rename to linux/system-daemon/softu2f.preset diff --git a/system-daemon/softu2f.service b/linux/system-daemon/softu2f.service similarity index 100% rename from system-daemon/softu2f.service rename to linux/system-daemon/softu2f.service diff --git a/system-daemon/softu2f.socket b/linux/system-daemon/softu2f.socket similarity index 100% rename from system-daemon/softu2f.socket rename to linux/system-daemon/softu2f.socket diff --git a/system-daemon/src/bidirectional_pipe.rs b/linux/system-daemon/src/bidirectional_pipe.rs similarity index 100% rename from system-daemon/src/bidirectional_pipe.rs rename to linux/system-daemon/src/bidirectional_pipe.rs diff --git a/system-daemon/src/codec.rs b/linux/system-daemon/src/codec.rs similarity index 100% rename from system-daemon/src/codec.rs rename to linux/system-daemon/src/codec.rs diff --git a/system-daemon/src/definitions.rs b/linux/system-daemon/src/definitions.rs similarity index 100% rename from system-daemon/src/definitions.rs rename to linux/system-daemon/src/definitions.rs diff --git a/system-daemon/src/device.rs b/linux/system-daemon/src/device.rs similarity index 100% rename from system-daemon/src/device.rs rename to linux/system-daemon/src/device.rs diff --git a/system-daemon/src/lib.rs b/linux/system-daemon/src/lib.rs similarity index 100% rename from system-daemon/src/lib.rs rename to linux/system-daemon/src/lib.rs diff --git a/system-daemon/src/main.rs b/linux/system-daemon/src/main.rs similarity index 100% rename from system-daemon/src/main.rs rename to linux/system-daemon/src/main.rs diff --git a/system-daemon/src/proto.rs b/linux/system-daemon/src/proto.rs similarity index 100% rename from system-daemon/src/proto.rs rename to linux/system-daemon/src/proto.rs diff --git a/system-daemon/src/sequential_stream.rs b/linux/system-daemon/src/sequential_stream.rs similarity index 100% rename from system-daemon/src/sequential_stream.rs rename to linux/system-daemon/src/sequential_stream.rs diff --git a/linux-uhid-sys/Cargo.toml b/linux/uhid-sys/Cargo.toml similarity index 100% rename from linux-uhid-sys/Cargo.toml rename to linux/uhid-sys/Cargo.toml diff --git a/linux-uhid-sys/build.rs b/linux/uhid-sys/build.rs similarity index 100% rename from linux-uhid-sys/build.rs rename to linux/uhid-sys/build.rs diff --git a/linux-uhid-sys/src/lib.rs b/linux/uhid-sys/src/lib.rs similarity index 100% rename from linux-uhid-sys/src/lib.rs rename to linux/uhid-sys/src/lib.rs diff --git a/linux-uhid-sys/wrapper.h b/linux/uhid-sys/wrapper.h similarity index 100% rename from linux-uhid-sys/wrapper.h rename to linux/uhid-sys/wrapper.h diff --git a/linux-uhid-tokio/Cargo.toml b/linux/uhid-tokio/Cargo.toml similarity index 92% rename from linux-uhid-tokio/Cargo.toml rename to linux/uhid-tokio/Cargo.toml index 026cdc5..71f072a 100644 --- a/linux-uhid-tokio/Cargo.toml +++ b/linux/uhid-tokio/Cargo.toml @@ -16,4 +16,4 @@ tokio-io = "0.1.3" tokio-proto = "0.1.1" [dependencies.linux-uhid-sys] -path = "../linux-uhid-sys" +path = "../uhid-sys" diff --git a/linux-uhid-tokio/example/.gitignore b/linux/uhid-tokio/example/.gitignore similarity index 100% rename from linux-uhid-tokio/example/.gitignore rename to linux/uhid-tokio/example/.gitignore diff --git a/linux-uhid-tokio/example/Cargo.toml b/linux/uhid-tokio/example/Cargo.toml similarity index 100% rename from linux-uhid-tokio/example/Cargo.toml rename to linux/uhid-tokio/example/Cargo.toml diff --git a/linux-uhid-tokio/example/src/main.rs b/linux/uhid-tokio/example/src/main.rs similarity index 100% rename from linux-uhid-tokio/example/src/main.rs rename to linux/uhid-tokio/example/src/main.rs diff --git a/linux-uhid-tokio/src/character_device.rs b/linux/uhid-tokio/src/character_device.rs similarity index 100% rename from linux-uhid-tokio/src/character_device.rs rename to linux/uhid-tokio/src/character_device.rs diff --git a/linux-uhid-tokio/src/character_device_file.rs b/linux/uhid-tokio/src/character_device_file.rs similarity index 100% rename from linux-uhid-tokio/src/character_device_file.rs rename to linux/uhid-tokio/src/character_device_file.rs diff --git a/linux-uhid-tokio/src/lib.rs b/linux/uhid-tokio/src/lib.rs similarity index 100% rename from linux-uhid-tokio/src/lib.rs rename to linux/uhid-tokio/src/lib.rs diff --git a/linux-uhid-tokio/src/poll_evented_read_wrapper.rs b/linux/uhid-tokio/src/poll_evented_read_wrapper.rs similarity index 100% rename from linux-uhid-tokio/src/poll_evented_read_wrapper.rs rename to linux/uhid-tokio/src/poll_evented_read_wrapper.rs diff --git a/linux-uhid-tokio/src/uhid_codec.rs b/linux/uhid-tokio/src/uhid_codec.rs similarity index 100% rename from linux-uhid-tokio/src/uhid_codec.rs rename to linux/uhid-tokio/src/uhid_codec.rs diff --git a/linux-uhid-tokio/src/uhid_device.rs b/linux/uhid-tokio/src/uhid_device.rs similarity index 100% rename from linux-uhid-tokio/src/uhid_device.rs rename to linux/uhid-tokio/src/uhid_device.rs diff --git a/linux-uhid-tokio/test/generate-uhid-requests.c b/linux/uhid-tokio/test/generate-uhid-requests.c similarity index 100% rename from linux-uhid-tokio/test/generate-uhid-requests.c rename to linux/uhid-tokio/test/generate-uhid-requests.c diff --git a/user-daemon/Cargo.toml b/linux/user-daemon/Cargo.toml similarity index 95% rename from user-daemon/Cargo.toml rename to linux/user-daemon/Cargo.toml index e852087..b9ffc04 100644 --- a/user-daemon/Cargo.toml +++ b/linux/user-daemon/Cargo.toml @@ -23,10 +23,10 @@ tokio-uds = "0.1.7" path = "../system-daemon" [dependencies.u2f-core] -path = "../u2f-core" +path = "../../u2f-core" [dependencies.u2fhid-protocol] -path = "../u2fhid-protocol" +path = "../../u2fhid-protocol" [dev-dependencies] tempdir = "0.3.5" diff --git a/user-daemon/Makefile b/linux/user-daemon/Makefile similarity index 100% rename from user-daemon/Makefile rename to linux/user-daemon/Makefile diff --git a/user-daemon/maintainer-scripts/postinst b/linux/user-daemon/maintainer-scripts/postinst similarity index 100% rename from user-daemon/maintainer-scripts/postinst rename to linux/user-daemon/maintainer-scripts/postinst diff --git a/user-daemon/maintainer-scripts/prerm b/linux/user-daemon/maintainer-scripts/prerm similarity index 100% rename from user-daemon/maintainer-scripts/prerm rename to linux/user-daemon/maintainer-scripts/prerm diff --git a/user-daemon/softu2f-user-daemon.spec b/linux/user-daemon/softu2f-user-daemon.spec similarity index 100% rename from user-daemon/softu2f-user-daemon.spec rename to linux/user-daemon/softu2f-user-daemon.spec diff --git a/user-daemon/softu2f.preset b/linux/user-daemon/softu2f.preset similarity index 100% rename from user-daemon/softu2f.preset rename to linux/user-daemon/softu2f.preset diff --git a/user-daemon/softu2f.service b/linux/user-daemon/softu2f.service similarity index 100% rename from user-daemon/softu2f.service rename to linux/user-daemon/softu2f.service diff --git a/user-daemon/src/file_store.rs b/linux/user-daemon/src/file_store.rs similarity index 100% rename from user-daemon/src/file_store.rs rename to linux/user-daemon/src/file_store.rs diff --git a/user-daemon/src/main.rs b/linux/user-daemon/src/main.rs similarity index 100% rename from user-daemon/src/main.rs rename to linux/user-daemon/src/main.rs diff --git a/user-daemon/src/user_presence.rs b/linux/user-daemon/src/user_presence.rs similarity index 100% rename from user-daemon/src/user_presence.rs rename to linux/user-daemon/src/user_presence.rs