diff options
author | Robert Schwebel <r.schwebel@pengutronix.de> | 2017-06-30 14:42:35 +0200 |
---|---|---|
committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2017-06-30 16:43:43 +0200 |
commit | 5dbe65d9c12d35f8e4b9b674b492f98dbe76832a (patch) | |
tree | 8e011b0816c33379bf6adada14d29c031b8f6986 | |
parent | ba9ebc41d68796af335f0fcce4888a332936cea8 (diff) | |
download | DistroKit-5dbe65d9c12d35f8e4b9b674b492f98dbe76832a.tar.gz DistroKit-5dbe65d9c12d35f8e4b9b674b492f98dbe76832a.tar.xz |
datapartition: /usr merge
Since 69841205bc7e114c40ccd3303fae2c97d0c42184 in ptxdist, the systemd
/usr merge is active. Adapt local rules as well.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-rw-r--r-- | projectroot/usr/lib/systemd/system/systemd-autoformat@.service (renamed from projectroot/lib/systemd/system/systemd-autoformat@.service) | 0 | ||||
-rw-r--r-- | projectroot/usr/lib/systemd/system/urshd.service (renamed from projectroot/lib/systemd/system/urshd.service) | 0 | ||||
-rw-r--r-- | projectroot/usr/lib/udev/rules.d/91-mkfs-ext4.rules (renamed from projectroot/lib/udev/rules.d/91-mkfs-ext4.rules) | 0 | ||||
-rw-r--r-- | rules/datapartition.make | 4 |
4 files changed, 2 insertions, 2 deletions
diff --git a/projectroot/lib/systemd/system/systemd-autoformat@.service b/projectroot/usr/lib/systemd/system/systemd-autoformat@.service index 7522140..7522140 100644 --- a/projectroot/lib/systemd/system/systemd-autoformat@.service +++ b/projectroot/usr/lib/systemd/system/systemd-autoformat@.service diff --git a/projectroot/lib/systemd/system/urshd.service b/projectroot/usr/lib/systemd/system/urshd.service index 65d04ab..65d04ab 100644 --- a/projectroot/lib/systemd/system/urshd.service +++ b/projectroot/usr/lib/systemd/system/urshd.service diff --git a/projectroot/lib/udev/rules.d/91-mkfs-ext4.rules b/projectroot/usr/lib/udev/rules.d/91-mkfs-ext4.rules index 1c1a396..1c1a396 100644 --- a/projectroot/lib/udev/rules.d/91-mkfs-ext4.rules +++ b/projectroot/usr/lib/udev/rules.d/91-mkfs-ext4.rules diff --git a/rules/datapartition.make b/rules/datapartition.make index 9cda1b1..9958186 100644 --- a/rules/datapartition.make +++ b/rules/datapartition.make @@ -29,9 +29,9 @@ $(STATEDIR)/datapartition.targetinstall: @$(call install_fixup,datapartition,DESCRIPTION,missing) @$(call install_alternative, datapartition, 0, 0, 0644, \ - /lib/systemd/system/systemd-autoformat@.service) + /usr/lib/systemd/system/systemd-autoformat@.service) @$(call install_alternative, datapartition, 0, 0, 0644, \ - /lib/udev/rules.d/91-mkfs-ext4.rules) + /usr/lib/udev/rules.d/91-mkfs-ext4.rules) @$(call install_finish,datapartition) |