From a765dc17592ca04dbea002a0d526d5e4bef52a4a Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sun, 3 May 2026 15:21:42 -0700 Subject: [PATCH] misc lil cleanups (#582) * cleanup apt hook * Move VERSION into rootfs overlay * Use broad rootfs overlay copy --- .github/workflows/build.yaml | 4 ++-- Dockerfile.agnos | 13 +------------ VERSION => userspace/root/VERSION | 0 userspace/{files => root/etc/apt}/apt.conf | 0 userspace/root/usr/comma/apt_setup.sh | 5 +++++ userspace/root/usr/comma/apt_teardown.sh | 5 +++++ userspace/root/{ => usr}/lib/firmware/a630_gmu.bin | Bin userspace/root/{ => usr}/lib/firmware/a630_sqe.fw | Bin userspace/root/{ => usr}/lib/firmware/a630_zap.b00 | Bin userspace/root/{ => usr}/lib/firmware/a630_zap.b01 | Bin userspace/root/{ => usr}/lib/firmware/a630_zap.b02 | Bin userspace/root/{ => usr}/lib/firmware/a630_zap.elf | Bin userspace/root/{ => usr}/lib/firmware/a630_zap.mdt | Bin .../root/{ => usr}/lib/firmware/ipa/ipa_fws.elf | Bin userspace/root/{ => usr}/lib/firmware/ipa_fws.b00 | Bin userspace/root/{ => usr}/lib/firmware/ipa_fws.b01 | Bin userspace/root/{ => usr}/lib/firmware/ipa_fws.b02 | Bin userspace/root/{ => usr}/lib/firmware/ipa_fws.b03 | Bin userspace/root/{ => usr}/lib/firmware/ipa_fws.b04 | Bin userspace/root/{ => usr}/lib/firmware/ipa_fws.mdt | Bin userspace/root/{ => usr}/lib/firmware/updates | 0 .../lib/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini | 0 .../lib/systemd/system/adb-param-watcher.path | 0 .../lib/systemd/system/adb-param-watcher.service | 0 .../root/{ => usr}/lib/systemd/system/adbd.service | 0 .../lib/systemd/system/agnos-debug.service | 0 .../lib/systemd/system/avahi-ssh-publish.service | 0 .../lib/systemd/system/brightnessd.service | 0 .../{ => usr}/lib/systemd/system/comma.service | 0 .../{ => usr}/lib/systemd/system/fs_setup.service | 0 .../root/{ => usr}/lib/systemd/system/gpio.service | 0 .../{ => usr}/lib/systemd/system/init-qcom.service | 0 .../lib/systemd/system/init_sys_mss.service | 0 .../{ => usr}/lib/systemd/system/leprop.service | 0 .../root/{ => usr}/lib/systemd/system/logd.service | 0 .../lib/systemd/system/logrotate-hourly.timer | 0 .../root/{ => usr}/lib/systemd/system/lte.service | 0 .../{ => usr}/lib/systemd/system/magic.service | 0 .../multi-user.target.wants/init_sys_mss.service | 0 .../system/multi-user.target.wants/leprop.service | 0 .../system/multi-user.target.wants/logd.service | 0 .../multi-user.target.wants/persist-prop.service | 0 .../multi-user.target.wants/rmt_storage.service | 0 .../lib/systemd/system/persist-prop.service | 0 .../lib/systemd/system/power_drop_monitor.service | 0 .../lib/systemd/system/power_monitor.service | 0 .../lib/systemd/system/rmt_storage.service | 0 .../lib/systemd/system/screen_calibration.service | 0 .../serial-getty@ttyMSM0_override.conf | 0 .../lib/systemd/system/serial-hostname.service | 0 .../{ => usr}/lib/systemd/system/sound.service | 0 .../lib/systemd/system/ssh-param-watcher.path | 0 .../lib/systemd/system/ssh-param-watcher.service | 0 .../lib/systemd/system/ssh.service.d/override.conf | 0 .../{ => usr}/lib/systemd/system/varwatch.service | 0 userspace/root/{ => usr}/sbin/abctl | Bin userspace/root/{ => usr}/sbin/init_mss | Bin userspace/root/{ => usr}/sbin/leprop-service | Bin userspace/root/{ => usr}/sbin/logd | Bin userspace/root/{ => usr}/sbin/persist-prop.sh | 0 userspace/root/{ => usr}/sbin/rmt_storage | Bin userspace/root/{ => usr}/sbin/tftp_server | Bin 62 files changed, 13 insertions(+), 14 deletions(-) rename VERSION => userspace/root/VERSION (100%) rename userspace/{files => root/etc/apt}/apt.conf (100%) rename userspace/root/{ => usr}/lib/firmware/a630_gmu.bin (100%) rename userspace/root/{ => usr}/lib/firmware/a630_sqe.fw (100%) rename userspace/root/{ => usr}/lib/firmware/a630_zap.b00 (100%) rename userspace/root/{ => usr}/lib/firmware/a630_zap.b01 (100%) rename userspace/root/{ => usr}/lib/firmware/a630_zap.b02 (100%) rename userspace/root/{ => usr}/lib/firmware/a630_zap.elf (100%) rename userspace/root/{ => usr}/lib/firmware/a630_zap.mdt (100%) rename userspace/root/{ => usr}/lib/firmware/ipa/ipa_fws.elf (100%) rename userspace/root/{ => usr}/lib/firmware/ipa_fws.b00 (100%) rename userspace/root/{ => usr}/lib/firmware/ipa_fws.b01 (100%) rename userspace/root/{ => usr}/lib/firmware/ipa_fws.b02 (100%) rename userspace/root/{ => usr}/lib/firmware/ipa_fws.b03 (100%) rename userspace/root/{ => usr}/lib/firmware/ipa_fws.b04 (100%) rename userspace/root/{ => usr}/lib/firmware/ipa_fws.mdt (100%) rename userspace/root/{ => usr}/lib/firmware/updates (100%) rename userspace/root/{ => usr}/lib/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini (100%) rename userspace/root/{ => usr}/lib/systemd/system/adb-param-watcher.path (100%) rename userspace/root/{ => usr}/lib/systemd/system/adb-param-watcher.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/adbd.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/agnos-debug.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/avahi-ssh-publish.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/brightnessd.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/comma.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/fs_setup.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/gpio.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/init-qcom.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/init_sys_mss.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/leprop.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/logd.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/logrotate-hourly.timer (100%) rename userspace/root/{ => usr}/lib/systemd/system/lte.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/magic.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/multi-user.target.wants/init_sys_mss.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/multi-user.target.wants/leprop.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/multi-user.target.wants/logd.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/multi-user.target.wants/persist-prop.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/multi-user.target.wants/rmt_storage.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/persist-prop.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/power_drop_monitor.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/power_monitor.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/rmt_storage.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/screen_calibration.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/serial-getty@ttyMSM0.service.d/serial-getty@ttyMSM0_override.conf (100%) rename userspace/root/{ => usr}/lib/systemd/system/serial-hostname.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/sound.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/ssh-param-watcher.path (100%) rename userspace/root/{ => usr}/lib/systemd/system/ssh-param-watcher.service (100%) rename userspace/root/{ => usr}/lib/systemd/system/ssh.service.d/override.conf (100%) rename userspace/root/{ => usr}/lib/systemd/system/varwatch.service (100%) rename userspace/root/{ => usr}/sbin/abctl (100%) rename userspace/root/{ => usr}/sbin/init_mss (100%) rename userspace/root/{ => usr}/sbin/leprop-service (100%) rename userspace/root/{ => usr}/sbin/logd (100%) rename userspace/root/{ => usr}/sbin/persist-prop.sh (100%) rename userspace/root/{ => usr}/sbin/rmt_storage (100%) rename userspace/root/{ => usr}/sbin/tftp_server (100%) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 9217ee3..a74f39f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -59,7 +59,7 @@ jobs: - name: Update VERSION if: github.event_name == 'pull_request' run: | - echo -n $(cat VERSION)-$(echo ${{ github.event.pull_request.head.sha }} | cut -c1-7) > VERSION + echo -n $(cat userspace/root/VERSION)-$(echo ${{ github.event.pull_request.head.sha }} | cut -c1-7) > userspace/root/VERSION - name: Build system env: @@ -86,7 +86,7 @@ jobs: if: "contains(env.LAST_COMMIT_MESSAGE, '[upload]')" run: | echo ${{ github.event.number }} > output/ota/PR - cp VERSION output/ota + cp userspace/root/VERSION output/ota echo "${{ steps.stats.outputs.stats_summary }}" > output/ota/agnos_stats.txt - name: Upload artifacts diff --git a/Dockerfile.agnos b/Dockerfile.agnos index 2e55d1c..22078dd 100644 --- a/Dockerfile.agnos +++ b/Dockerfile.agnos @@ -78,12 +78,7 @@ RUN /tmp/agnos/openpilot_python_dependencies.sh FROM agnos-base # Hardware rootfs overlay -COPY ./userspace/root/etc/ /etc/ -COPY ./userspace/root/lib/ /usr/lib/ -COPY ./userspace/root/home/ /home/ -COPY ./userspace/root/sbin/ /usr/sbin/ -COPY ./userspace/root/system/ /system/ -COPY ./userspace/root/usr/ /usr/ +COPY ./userspace/root/ / RUN mkdir -p /dsp /firmware /persist /data /cache /rwtmp COPY --from=agnos-compiler-libqmi /tmp/libqmi.deb /tmp/ @@ -166,12 +161,6 @@ RUN mkdir -p /tmptmp COPY ./userspace/readonly_setup.sh /tmptmp/readonly_setup.sh RUN /tmptmp/readonly_setup.sh && rm -rf /tmptmp -# copy at the end, after all apt usage -COPY ./userspace/files/apt.conf /etc/apt/apt.conf - -# copy version file -COPY VERSION /VERSION - # ################# # # #### Cleanup #### # # ################# # diff --git a/VERSION b/userspace/root/VERSION similarity index 100% rename from VERSION rename to userspace/root/VERSION diff --git a/userspace/files/apt.conf b/userspace/root/etc/apt/apt.conf similarity index 100% rename from userspace/files/apt.conf rename to userspace/root/etc/apt/apt.conf diff --git a/userspace/root/usr/comma/apt_setup.sh b/userspace/root/usr/comma/apt_setup.sh index 75e3b60..5af3ca3 100755 --- a/userspace/root/usr/comma/apt_setup.sh +++ b/userspace/root/usr/comma/apt_setup.sh @@ -1,5 +1,10 @@ #!/bin/bash -e +# Skip while Docker is assembling the image. +if [ -f /.dockerenv ]; then + exit 0 +fi + sudo mount -o rw,remount / sudo resize2fs $(findmnt -n -o SOURCE /) &>/dev/null || sudo resize2fs $(findmnt -n -o SOURCE /) sudo mount -o remount,size=1500M /var diff --git a/userspace/root/usr/comma/apt_teardown.sh b/userspace/root/usr/comma/apt_teardown.sh index 76cf4fe..6b2c30e 100755 --- a/userspace/root/usr/comma/apt_teardown.sh +++ b/userspace/root/usr/comma/apt_teardown.sh @@ -1,3 +1,8 @@ #!/bin/bash +# Skip while Docker is assembling the image. +if [ -f /.dockerenv ]; then + exit 0 +fi + sudo mount -o ro,remount / || true diff --git a/userspace/root/lib/firmware/a630_gmu.bin b/userspace/root/usr/lib/firmware/a630_gmu.bin similarity index 100% rename from userspace/root/lib/firmware/a630_gmu.bin rename to userspace/root/usr/lib/firmware/a630_gmu.bin diff --git a/userspace/root/lib/firmware/a630_sqe.fw b/userspace/root/usr/lib/firmware/a630_sqe.fw similarity index 100% rename from userspace/root/lib/firmware/a630_sqe.fw rename to userspace/root/usr/lib/firmware/a630_sqe.fw diff --git a/userspace/root/lib/firmware/a630_zap.b00 b/userspace/root/usr/lib/firmware/a630_zap.b00 similarity index 100% rename from userspace/root/lib/firmware/a630_zap.b00 rename to userspace/root/usr/lib/firmware/a630_zap.b00 diff --git a/userspace/root/lib/firmware/a630_zap.b01 b/userspace/root/usr/lib/firmware/a630_zap.b01 similarity index 100% rename from userspace/root/lib/firmware/a630_zap.b01 rename to userspace/root/usr/lib/firmware/a630_zap.b01 diff --git a/userspace/root/lib/firmware/a630_zap.b02 b/userspace/root/usr/lib/firmware/a630_zap.b02 similarity index 100% rename from userspace/root/lib/firmware/a630_zap.b02 rename to userspace/root/usr/lib/firmware/a630_zap.b02 diff --git a/userspace/root/lib/firmware/a630_zap.elf b/userspace/root/usr/lib/firmware/a630_zap.elf similarity index 100% rename from userspace/root/lib/firmware/a630_zap.elf rename to userspace/root/usr/lib/firmware/a630_zap.elf diff --git a/userspace/root/lib/firmware/a630_zap.mdt b/userspace/root/usr/lib/firmware/a630_zap.mdt similarity index 100% rename from userspace/root/lib/firmware/a630_zap.mdt rename to userspace/root/usr/lib/firmware/a630_zap.mdt diff --git a/userspace/root/lib/firmware/ipa/ipa_fws.elf b/userspace/root/usr/lib/firmware/ipa/ipa_fws.elf similarity index 100% rename from userspace/root/lib/firmware/ipa/ipa_fws.elf rename to userspace/root/usr/lib/firmware/ipa/ipa_fws.elf diff --git a/userspace/root/lib/firmware/ipa_fws.b00 b/userspace/root/usr/lib/firmware/ipa_fws.b00 similarity index 100% rename from userspace/root/lib/firmware/ipa_fws.b00 rename to userspace/root/usr/lib/firmware/ipa_fws.b00 diff --git a/userspace/root/lib/firmware/ipa_fws.b01 b/userspace/root/usr/lib/firmware/ipa_fws.b01 similarity index 100% rename from userspace/root/lib/firmware/ipa_fws.b01 rename to userspace/root/usr/lib/firmware/ipa_fws.b01 diff --git a/userspace/root/lib/firmware/ipa_fws.b02 b/userspace/root/usr/lib/firmware/ipa_fws.b02 similarity index 100% rename from userspace/root/lib/firmware/ipa_fws.b02 rename to userspace/root/usr/lib/firmware/ipa_fws.b02 diff --git a/userspace/root/lib/firmware/ipa_fws.b03 b/userspace/root/usr/lib/firmware/ipa_fws.b03 similarity index 100% rename from userspace/root/lib/firmware/ipa_fws.b03 rename to userspace/root/usr/lib/firmware/ipa_fws.b03 diff --git a/userspace/root/lib/firmware/ipa_fws.b04 b/userspace/root/usr/lib/firmware/ipa_fws.b04 similarity index 100% rename from userspace/root/lib/firmware/ipa_fws.b04 rename to userspace/root/usr/lib/firmware/ipa_fws.b04 diff --git a/userspace/root/lib/firmware/ipa_fws.mdt b/userspace/root/usr/lib/firmware/ipa_fws.mdt similarity index 100% rename from userspace/root/lib/firmware/ipa_fws.mdt rename to userspace/root/usr/lib/firmware/ipa_fws.mdt diff --git a/userspace/root/lib/firmware/updates b/userspace/root/usr/lib/firmware/updates similarity index 100% rename from userspace/root/lib/firmware/updates rename to userspace/root/usr/lib/firmware/updates diff --git a/userspace/root/lib/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini b/userspace/root/usr/lib/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini similarity index 100% rename from userspace/root/lib/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini rename to userspace/root/usr/lib/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini diff --git a/userspace/root/lib/systemd/system/adb-param-watcher.path b/userspace/root/usr/lib/systemd/system/adb-param-watcher.path similarity index 100% rename from userspace/root/lib/systemd/system/adb-param-watcher.path rename to userspace/root/usr/lib/systemd/system/adb-param-watcher.path diff --git a/userspace/root/lib/systemd/system/adb-param-watcher.service b/userspace/root/usr/lib/systemd/system/adb-param-watcher.service similarity index 100% rename from userspace/root/lib/systemd/system/adb-param-watcher.service rename to userspace/root/usr/lib/systemd/system/adb-param-watcher.service diff --git a/userspace/root/lib/systemd/system/adbd.service b/userspace/root/usr/lib/systemd/system/adbd.service similarity index 100% rename from userspace/root/lib/systemd/system/adbd.service rename to userspace/root/usr/lib/systemd/system/adbd.service diff --git a/userspace/root/lib/systemd/system/agnos-debug.service b/userspace/root/usr/lib/systemd/system/agnos-debug.service similarity index 100% rename from userspace/root/lib/systemd/system/agnos-debug.service rename to userspace/root/usr/lib/systemd/system/agnos-debug.service diff --git a/userspace/root/lib/systemd/system/avahi-ssh-publish.service b/userspace/root/usr/lib/systemd/system/avahi-ssh-publish.service similarity index 100% rename from userspace/root/lib/systemd/system/avahi-ssh-publish.service rename to userspace/root/usr/lib/systemd/system/avahi-ssh-publish.service diff --git a/userspace/root/lib/systemd/system/brightnessd.service b/userspace/root/usr/lib/systemd/system/brightnessd.service similarity index 100% rename from userspace/root/lib/systemd/system/brightnessd.service rename to userspace/root/usr/lib/systemd/system/brightnessd.service diff --git a/userspace/root/lib/systemd/system/comma.service b/userspace/root/usr/lib/systemd/system/comma.service similarity index 100% rename from userspace/root/lib/systemd/system/comma.service rename to userspace/root/usr/lib/systemd/system/comma.service diff --git a/userspace/root/lib/systemd/system/fs_setup.service b/userspace/root/usr/lib/systemd/system/fs_setup.service similarity index 100% rename from userspace/root/lib/systemd/system/fs_setup.service rename to userspace/root/usr/lib/systemd/system/fs_setup.service diff --git a/userspace/root/lib/systemd/system/gpio.service b/userspace/root/usr/lib/systemd/system/gpio.service similarity index 100% rename from userspace/root/lib/systemd/system/gpio.service rename to userspace/root/usr/lib/systemd/system/gpio.service diff --git a/userspace/root/lib/systemd/system/init-qcom.service b/userspace/root/usr/lib/systemd/system/init-qcom.service similarity index 100% rename from userspace/root/lib/systemd/system/init-qcom.service rename to userspace/root/usr/lib/systemd/system/init-qcom.service diff --git a/userspace/root/lib/systemd/system/init_sys_mss.service b/userspace/root/usr/lib/systemd/system/init_sys_mss.service similarity index 100% rename from userspace/root/lib/systemd/system/init_sys_mss.service rename to userspace/root/usr/lib/systemd/system/init_sys_mss.service diff --git a/userspace/root/lib/systemd/system/leprop.service b/userspace/root/usr/lib/systemd/system/leprop.service similarity index 100% rename from userspace/root/lib/systemd/system/leprop.service rename to userspace/root/usr/lib/systemd/system/leprop.service diff --git a/userspace/root/lib/systemd/system/logd.service b/userspace/root/usr/lib/systemd/system/logd.service similarity index 100% rename from userspace/root/lib/systemd/system/logd.service rename to userspace/root/usr/lib/systemd/system/logd.service diff --git a/userspace/root/lib/systemd/system/logrotate-hourly.timer b/userspace/root/usr/lib/systemd/system/logrotate-hourly.timer similarity index 100% rename from userspace/root/lib/systemd/system/logrotate-hourly.timer rename to userspace/root/usr/lib/systemd/system/logrotate-hourly.timer diff --git a/userspace/root/lib/systemd/system/lte.service b/userspace/root/usr/lib/systemd/system/lte.service similarity index 100% rename from userspace/root/lib/systemd/system/lte.service rename to userspace/root/usr/lib/systemd/system/lte.service diff --git a/userspace/root/lib/systemd/system/magic.service b/userspace/root/usr/lib/systemd/system/magic.service similarity index 100% rename from userspace/root/lib/systemd/system/magic.service rename to userspace/root/usr/lib/systemd/system/magic.service diff --git a/userspace/root/lib/systemd/system/multi-user.target.wants/init_sys_mss.service b/userspace/root/usr/lib/systemd/system/multi-user.target.wants/init_sys_mss.service similarity index 100% rename from userspace/root/lib/systemd/system/multi-user.target.wants/init_sys_mss.service rename to userspace/root/usr/lib/systemd/system/multi-user.target.wants/init_sys_mss.service diff --git a/userspace/root/lib/systemd/system/multi-user.target.wants/leprop.service b/userspace/root/usr/lib/systemd/system/multi-user.target.wants/leprop.service similarity index 100% rename from userspace/root/lib/systemd/system/multi-user.target.wants/leprop.service rename to userspace/root/usr/lib/systemd/system/multi-user.target.wants/leprop.service diff --git a/userspace/root/lib/systemd/system/multi-user.target.wants/logd.service b/userspace/root/usr/lib/systemd/system/multi-user.target.wants/logd.service similarity index 100% rename from userspace/root/lib/systemd/system/multi-user.target.wants/logd.service rename to userspace/root/usr/lib/systemd/system/multi-user.target.wants/logd.service diff --git a/userspace/root/lib/systemd/system/multi-user.target.wants/persist-prop.service b/userspace/root/usr/lib/systemd/system/multi-user.target.wants/persist-prop.service similarity index 100% rename from userspace/root/lib/systemd/system/multi-user.target.wants/persist-prop.service rename to userspace/root/usr/lib/systemd/system/multi-user.target.wants/persist-prop.service diff --git a/userspace/root/lib/systemd/system/multi-user.target.wants/rmt_storage.service b/userspace/root/usr/lib/systemd/system/multi-user.target.wants/rmt_storage.service similarity index 100% rename from userspace/root/lib/systemd/system/multi-user.target.wants/rmt_storage.service rename to userspace/root/usr/lib/systemd/system/multi-user.target.wants/rmt_storage.service diff --git a/userspace/root/lib/systemd/system/persist-prop.service b/userspace/root/usr/lib/systemd/system/persist-prop.service similarity index 100% rename from userspace/root/lib/systemd/system/persist-prop.service rename to userspace/root/usr/lib/systemd/system/persist-prop.service diff --git a/userspace/root/lib/systemd/system/power_drop_monitor.service b/userspace/root/usr/lib/systemd/system/power_drop_monitor.service similarity index 100% rename from userspace/root/lib/systemd/system/power_drop_monitor.service rename to userspace/root/usr/lib/systemd/system/power_drop_monitor.service diff --git a/userspace/root/lib/systemd/system/power_monitor.service b/userspace/root/usr/lib/systemd/system/power_monitor.service similarity index 100% rename from userspace/root/lib/systemd/system/power_monitor.service rename to userspace/root/usr/lib/systemd/system/power_monitor.service diff --git a/userspace/root/lib/systemd/system/rmt_storage.service b/userspace/root/usr/lib/systemd/system/rmt_storage.service similarity index 100% rename from userspace/root/lib/systemd/system/rmt_storage.service rename to userspace/root/usr/lib/systemd/system/rmt_storage.service diff --git a/userspace/root/lib/systemd/system/screen_calibration.service b/userspace/root/usr/lib/systemd/system/screen_calibration.service similarity index 100% rename from userspace/root/lib/systemd/system/screen_calibration.service rename to userspace/root/usr/lib/systemd/system/screen_calibration.service diff --git a/userspace/root/lib/systemd/system/serial-getty@ttyMSM0.service.d/serial-getty@ttyMSM0_override.conf b/userspace/root/usr/lib/systemd/system/serial-getty@ttyMSM0.service.d/serial-getty@ttyMSM0_override.conf similarity index 100% rename from userspace/root/lib/systemd/system/serial-getty@ttyMSM0.service.d/serial-getty@ttyMSM0_override.conf rename to userspace/root/usr/lib/systemd/system/serial-getty@ttyMSM0.service.d/serial-getty@ttyMSM0_override.conf diff --git a/userspace/root/lib/systemd/system/serial-hostname.service b/userspace/root/usr/lib/systemd/system/serial-hostname.service similarity index 100% rename from userspace/root/lib/systemd/system/serial-hostname.service rename to userspace/root/usr/lib/systemd/system/serial-hostname.service diff --git a/userspace/root/lib/systemd/system/sound.service b/userspace/root/usr/lib/systemd/system/sound.service similarity index 100% rename from userspace/root/lib/systemd/system/sound.service rename to userspace/root/usr/lib/systemd/system/sound.service diff --git a/userspace/root/lib/systemd/system/ssh-param-watcher.path b/userspace/root/usr/lib/systemd/system/ssh-param-watcher.path similarity index 100% rename from userspace/root/lib/systemd/system/ssh-param-watcher.path rename to userspace/root/usr/lib/systemd/system/ssh-param-watcher.path diff --git a/userspace/root/lib/systemd/system/ssh-param-watcher.service b/userspace/root/usr/lib/systemd/system/ssh-param-watcher.service similarity index 100% rename from userspace/root/lib/systemd/system/ssh-param-watcher.service rename to userspace/root/usr/lib/systemd/system/ssh-param-watcher.service diff --git a/userspace/root/lib/systemd/system/ssh.service.d/override.conf b/userspace/root/usr/lib/systemd/system/ssh.service.d/override.conf similarity index 100% rename from userspace/root/lib/systemd/system/ssh.service.d/override.conf rename to userspace/root/usr/lib/systemd/system/ssh.service.d/override.conf diff --git a/userspace/root/lib/systemd/system/varwatch.service b/userspace/root/usr/lib/systemd/system/varwatch.service similarity index 100% rename from userspace/root/lib/systemd/system/varwatch.service rename to userspace/root/usr/lib/systemd/system/varwatch.service diff --git a/userspace/root/sbin/abctl b/userspace/root/usr/sbin/abctl similarity index 100% rename from userspace/root/sbin/abctl rename to userspace/root/usr/sbin/abctl diff --git a/userspace/root/sbin/init_mss b/userspace/root/usr/sbin/init_mss similarity index 100% rename from userspace/root/sbin/init_mss rename to userspace/root/usr/sbin/init_mss diff --git a/userspace/root/sbin/leprop-service b/userspace/root/usr/sbin/leprop-service similarity index 100% rename from userspace/root/sbin/leprop-service rename to userspace/root/usr/sbin/leprop-service diff --git a/userspace/root/sbin/logd b/userspace/root/usr/sbin/logd similarity index 100% rename from userspace/root/sbin/logd rename to userspace/root/usr/sbin/logd diff --git a/userspace/root/sbin/persist-prop.sh b/userspace/root/usr/sbin/persist-prop.sh similarity index 100% rename from userspace/root/sbin/persist-prop.sh rename to userspace/root/usr/sbin/persist-prop.sh diff --git a/userspace/root/sbin/rmt_storage b/userspace/root/usr/sbin/rmt_storage similarity index 100% rename from userspace/root/sbin/rmt_storage rename to userspace/root/usr/sbin/rmt_storage diff --git a/userspace/root/sbin/tftp_server b/userspace/root/usr/sbin/tftp_server similarity index 100% rename from userspace/root/sbin/tftp_server rename to userspace/root/usr/sbin/tftp_server