fixed bug introduced in download_sources target
This commit is contained in:
1
Makefile
1
Makefile
@@ -99,6 +99,7 @@ master:
|
|||||||
|
|
||||||
livecd:
|
livecd:
|
||||||
set -e
|
set -e
|
||||||
|
make disarm_chroot
|
||||||
sudo /usr/bin/env -i bash -c ". ./project_config.sh && ${dir_make}/livecd.sh"
|
sudo /usr/bin/env -i bash -c ". ./project_config.sh && ${dir_make}/livecd.sh"
|
||||||
|
|
||||||
# example:
|
# example:
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ wget \
|
|||||||
https://storage.darkhorselinux.org/sources/upstream_sources/ \
|
https://storage.darkhorselinux.org/sources/upstream_sources/ \
|
||||||
|| echofail "Downloading sources..."
|
|| echofail "Downloading sources..."
|
||||||
|
|
||||||
|
|
||||||
echo "Validating source downloads..."
|
echo "Validating source downloads..."
|
||||||
pushd ${dir_sources} 1>/dev/null 2>/dev/null
|
pushd ${dir_sources} 1>/dev/null 2>/dev/null
|
||||||
|
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ mode_build() {
|
|||||||
--sysconfdir=/etc \
|
--sysconfdir=/etc \
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--with-history \
|
--with-history \
|
||||||
--docdir=/usr/share/doc/${APPNAME}-${VERSION}
|
--docdir=/usr/share/doc/${APPNAME}-${VERSION} \
|
||||||
PYTHON=/usr/bin/python3
|
PYTHON=/usr/bin/python3
|
||||||
assert_zero $?
|
assert_zero $?
|
||||||
|
|
||||||
|
|||||||
@@ -41,6 +41,13 @@ assert_zero $?
|
|||||||
pushd ${dir_artifacts}
|
pushd ${dir_artifacts}
|
||||||
assert_zero $?
|
assert_zero $?
|
||||||
|
|
||||||
|
logprint "Emptying source stage..."
|
||||||
|
rm -Rf ${TEMP_STAGE_DIR}
|
||||||
|
assert_zero $?
|
||||||
|
|
||||||
|
rm -Rf /rex_embedded
|
||||||
|
assert_zero $?
|
||||||
|
|
||||||
logprint "Generating initramfs..."
|
logprint "Generating initramfs..."
|
||||||
# TODO chroot ignores this, and it breaks binutils pass 3
|
# TODO chroot ignores this, and it breaks binutils pass 3
|
||||||
ulimit -n 3000000
|
ulimit -n 3000000
|
||||||
|
|||||||
Reference in New Issue
Block a user