Merge branch 'macos-build-fixes' into 'master'

Macos build fixes

See merge request redox-os/cookbook!271
This commit is contained in:
Jeremy Soller 2023-04-05 14:56:43 +00:00
commit 033e32dc6d
3 changed files with 6 additions and 3 deletions

View File

@ -51,3 +51,6 @@ else
FIND="find"
STAT="stat";
fi
export FIND
export STAT

View File

@ -9,7 +9,7 @@ script = """
--workspace
mkdir -pv "${COOKBOOK_STAGE}/bin"
find "target/${TARGET}/release" \
${FIND} "target/${TARGET}/release" \
-maxdepth 1 \
-executable \
-type f \
@ -19,7 +19,7 @@ mkdir -pv "${COOKBOOK_STAGE}/etc/pcid"
cp -v "${COOKBOOK_SOURCE}/initfs.toml" "${COOKBOOK_STAGE}/etc/pcid/initfs.toml"
mkdir -pv "${COOKBOOK_STAGE}/etc/pcid.d"
find "${COOKBOOK_SOURCE}" -maxdepth 2 -type f -name 'config.toml' | while read conf
${FIND} "${COOKBOOK_SOURCE}" -maxdepth 2 -type f -name 'config.toml' | while read conf
do
driver="$(basename "$(dirname "$conf")")"
cp -v "$conf" "${COOKBOOK_STAGE}/etc/pcid.d/$driver.toml"

View File

@ -48,7 +48,7 @@ do
fi
# Match pkgar and tar time
touch --no-create --reference="${COOKBOOK_STAGE}.tar.gz" "${COOKBOOK_STAGE}.pkgar"
touch -c -r "${COOKBOOK_STAGE}.tar.gz" "${COOKBOOK_STAGE}.pkgar"
continue
fi