mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-20 02:02:58 +01:00
Make preseed work in sysc
- TODO: tar-1.34 does not work properly with preseed.
This commit is contained in:
parent
b285bc93b6
commit
38b90d6a96
1 changed files with 5 additions and 1 deletions
|
|
@ -107,6 +107,7 @@ bin_preseed() {
|
||||||
mv -- *-repodata ../repo
|
mv -- *-repodata ../repo
|
||||||
fi
|
fi
|
||||||
cd "${SRCDIR}/repo"
|
cd "${SRCDIR}/repo"
|
||||||
|
rm -f /tmp/filelist.txt
|
||||||
src_apply "${pkg}" $((revision))
|
src_apply "${pkg}" $((revision))
|
||||||
cd "${SOURCES}"
|
cd "${SOURCES}"
|
||||||
return 0
|
return 0
|
||||||
|
|
@ -128,7 +129,7 @@ build() {
|
||||||
script_name=${2:-${pkg}.sh}
|
script_name=${2:-${pkg}.sh}
|
||||||
dirname=${4:-${pkg}}
|
dirname=${4:-${pkg}}
|
||||||
|
|
||||||
bin_preseed && return
|
bin_preseed && return || true # Normal build if preseed fails
|
||||||
|
|
||||||
cd "${SOURCES}/${pkg}" || (echo "Cannot cd into ${pkg}!"; kill $$)
|
cd "${SOURCES}/${pkg}" || (echo "Cannot cd into ${pkg}!"; kill $$)
|
||||||
echo "${pkg}: beginning build using script ${script_name}"
|
echo "${pkg}: beginning build using script ${script_name}"
|
||||||
|
|
@ -472,6 +473,9 @@ sys_transfer() {
|
||||||
cp -r "${sys_sources}/"* "${dest}/${PREFIX}/src"
|
cp -r "${sys_sources}/"* "${dest}/${PREFIX}/src"
|
||||||
cp -f "${sys_sources}/init" "${dest}/"
|
cp -f "${sys_sources}/init" "${dest}/"
|
||||||
cp -r "${PREFIX}/src/repo" "${dest}/${PREFIX}/src"
|
cp -r "${PREFIX}/src/repo" "${dest}/${PREFIX}/src"
|
||||||
|
if [ -e "${PREFIX}/src/repo-preseeded" ]; then
|
||||||
|
cp -r "${PREFIX}/src/repo-preseeded" "${dest}/${PREFIX}/src"
|
||||||
|
fi
|
||||||
|
|
||||||
shift 2
|
shift 2
|
||||||
# Copy additional binaries
|
# Copy additional binaries
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue