aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2020-05-13 02:49:49 -0500
committerRob Landley <rob@landley.net>2020-05-13 02:49:49 -0500
commit75833aa33e587ea75fb9e9eee7b6ce593798be3a (patch)
tree9888a2b3a6182044dd62d06bcd4da9f2438b385f
parent4c320bfbbba9842c93ac5807bc8cbefbfff429b6 (diff)
downloadtoybox-75833aa33e587ea75fb9e9eee7b6ce593798be3a.tar.gz
The gnu/dammit cpio is REALLY stupid, so only pass --no-preserve-owner
when using the toybox one. (This means /root will belong to the host user for the "make root" host target, which makes dropbear sad.)
-rwxr-xr-xscripts/mkroot.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mkroot.sh b/scripts/mkroot.sh
index ade50a06..3d46099f 100755
--- a/scripts/mkroot.sh
+++ b/scripts/mkroot.sh
@@ -243,6 +243,6 @@ fi
# clean up and package root filesystem for initramfs.
[ -z "$BUILTIN" ] && announce "${CROSS_BASE}root.cpio.gz" &&
- (cd "$ROOT" && find . | cpio -o -H newc --no-preserve-owner | gzip) \
+ (cd "$ROOT" && find . | cpio -o -H newc ${CROSS_COMPILE:+--no-preserve-owner} | gzip) \
> "$OUTPUT/$CROSS_BASE"root.cpio.gz
rmdir "$MYBUILD" "$BUILD" 2>/dev/null # remove if empty