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 !271
parents a2cfd448 a604a066
No related branches found
No related tags found
1 merge request!271Macos build fixes
...@@ -51,3 +51,6 @@ else ...@@ -51,3 +51,6 @@ else
FIND="find" FIND="find"
STAT="stat"; STAT="stat";
fi fi
export FIND
export STAT
...@@ -9,7 +9,7 @@ script = """ ...@@ -9,7 +9,7 @@ script = """
--workspace --workspace
mkdir -pv "${COOKBOOK_STAGE}/bin" mkdir -pv "${COOKBOOK_STAGE}/bin"
find "target/${TARGET}/release" \ ${FIND} "target/${TARGET}/release" \
-maxdepth 1 \ -maxdepth 1 \
-executable \ -executable \
-type f \ -type f \
...@@ -19,7 +19,7 @@ mkdir -pv "${COOKBOOK_STAGE}/etc/pcid" ...@@ -19,7 +19,7 @@ mkdir -pv "${COOKBOOK_STAGE}/etc/pcid"
cp -v "${COOKBOOK_SOURCE}/initfs.toml" "${COOKBOOK_STAGE}/etc/pcid/initfs.toml" cp -v "${COOKBOOK_SOURCE}/initfs.toml" "${COOKBOOK_STAGE}/etc/pcid/initfs.toml"
mkdir -pv "${COOKBOOK_STAGE}/etc/pcid.d" 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 do
driver="$(basename "$(dirname "$conf")")" driver="$(basename "$(dirname "$conf")")"
cp -v "$conf" "${COOKBOOK_STAGE}/etc/pcid.d/$driver.toml" cp -v "$conf" "${COOKBOOK_STAGE}/etc/pcid.d/$driver.toml"
......
...@@ -48,7 +48,7 @@ do ...@@ -48,7 +48,7 @@ do
fi fi
# Match pkgar and tar time # 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 continue
fi 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