Skip to content
Snippets Groups Projects
Commit 033e32dc authored by Jeremy Soller's avatar Jeremy Soller
Browse files

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

Macos build fixes

See merge request redox-os/cookbook!271
parents a2cfd448 a604a066
No related branches found
No related tags found
No related merge requests found
......@@ -51,3 +51,6 @@ else
FIND="find"
STAT="stat";
fi
export FIND
export STAT
......@@ -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"
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment