|
@@ -33,6 +33,7 @@ FULL_DEVICE_TABLE = $(BUILD_DIR)/_device_table.txt
|
|
|
ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE) \
|
|
|
$(BR2_ROOTFS_STATIC_DEVICE_TABLE))
|
|
|
USERS_TABLE = $(BUILD_DIR)/_users_table.txt
|
|
|
+ROOTFS_USERS_TABLES = $(call qstrip,$(BR2_ROOTFS_USERS_TABLES))
|
|
|
|
|
|
define ROOTFS_TARGET_INTERNAL
|
|
|
|
|
@@ -68,6 +69,7 @@ $$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(ROOTFS_$(2)_DEPENDENCIES)
|
|
|
$$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),$$(call $$(hook))$$(sep))
|
|
|
rm -f $$(FAKEROOT_SCRIPT)
|
|
|
rm -f $$(TARGET_DIR_WARNING_FILE)
|
|
|
+ rm -f $(USERS_TABLE)
|
|
|
echo "chown -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)
|
|
|
ifneq ($$(ROOTFS_DEVICE_TABLES),)
|
|
|
cat $$(ROOTFS_DEVICE_TABLES) > $$(FULL_DEVICE_TABLE)
|
|
@@ -77,7 +79,10 @@ endif
|
|
|
printf '$$(subst $$(sep),\n,$$(PACKAGES_PERMISSIONS_TABLE))' >> $$(FULL_DEVICE_TABLE)
|
|
|
echo "$$(HOST_DIR)/usr/bin/makedevs -d $$(FULL_DEVICE_TABLE) $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)
|
|
|
endif
|
|
|
- printf '$(subst $(sep),\n,$(PACKAGES_USERS))' > $(USERS_TABLE)
|
|
|
+ifneq ($$(ROOTFS_USERS_TABLES),)
|
|
|
+ cat $$(ROOTFS_USERS_TABLES) >> $(USERS_TABLE)
|
|
|
+endif
|
|
|
+ printf '$(subst $(sep),\n,$(PACKAGES_USERS))' >> $(USERS_TABLE)
|
|
|
$(TOPDIR)/support/scripts/mkusers $(USERS_TABLE) $(TARGET_DIR) >> $(FAKEROOT_SCRIPT)
|
|
|
echo "$$(ROOTFS_$(2)_CMD)" >> $$(FAKEROOT_SCRIPT)
|
|
|
chmod a+x $$(FAKEROOT_SCRIPT)
|