Commit 34221488 authored by Daniel Baumann's avatar Daniel Baumann
Browse files

Adding upstream version 4.0~alpha38.

parent 3ad6a401
4.0~alpha37-1
4.0~alpha38-1
......@@ -72,8 +72,8 @@ def main():
os.makedirs('binary/live-build/config', exist_ok=True)
mount = subprocess.call('mount -o bind config binary/live-build/config', shell=True)
remount = subprocess.call('mount -o remount,ro,bind binary/live-build/config', shell=True)
mount = subprocess.check_call('mount -o bind config binary/live-build/config', shell=True)
remount = subprocess.check_call('mount -o remount,ro,bind binary/live-build/config', shell=True)
# process hooks
os.makedirs('binary/live-build', exist_ok=True)
......@@ -90,11 +90,11 @@ def main():
print('I: Executing \' ' + hook + '\'')
os.chmod(hook, 0o755)
exec_hook = subprocess.call('cd binary && live-build/' + os.path.basename(hook), shell=True)
exec_hook = subprocess.check_call('cd binary && live-build/' + os.path.basename(hook), shell=True)
os.remove('binary/live-build/' + os.path.basename(hook))
# unmount coniguration directory
umount = subprocess.call('umount binary/live-build/config', shell=True)
umount = subprocess.check_call('umount binary/live-build/config', shell=True)
os.rmdir('binary/live-build/config')
os.rmdir('binary/live-build')
......
......@@ -84,13 +84,13 @@ def main():
if verbose:
print('I: Copying config/includes to binary')
cpio = subprocess.call('cd config/includes && find . | cpio -dmpu --no-preserve-owner ../../binary', shell=True)
cpio = subprocess.check_call('cd config/includes && find . | cpio -dmpu --no-preserve-owner ../../binary', shell=True)
if glob.glob('config/includes.binary/*') or glob.glob('config/includes.binary/.*'):
if verbose:
print('I: Copying config/includes.binary to binary')
cpio = subprocess.call('cd config/includes.binary && find . | cpio -dmpu --no-preserve-owner ../../binary', shell=True)
cpio = subprocess.check_call('cd config/includes.binary && find . | cpio -dmpu --no-preserve-owner ../../binary', shell=True)
# stagefile
os.makedirs('.build', exist_ok=True)
......
......@@ -113,7 +113,7 @@ def main():
# Notes:
# * there's no Python equivalent to 'cp -a' that handels both symlinks and device nodes properly.
cache = subprocess.call('cp -a cache/bootstrap chroot', shell=True)
cache = subprocess.check_call('cp -a cache/bootstrap chroot', shell=True)
os.makedirs('.build', exist_ok=True)
open('.build/bootstrap', 'w').close()
......@@ -140,7 +140,7 @@ def main():
# * calling cdebootstrap twice:
# - to use already downloaded /var/cache/bootstrap/*.deb on incomplete builds
# - to use /var/cache/boottrap/*.deb for debian-installer
cdebootstrap = subprocess.call('/usr/bin/cdebootstrap --download-only ' + cdebootstrap_options, shell=True)
cdebootstrap = subprocess.check_call('/usr/bin/cdebootstrap --download-only ' + cdebootstrap_options, shell=True)
# package cache
if glob.glob('chroot/var/cache/bootstrap/*.deb'):
......@@ -163,7 +163,7 @@ def main():
if verbose:
print('I: Calling \'/usr/bin/debootstrap ' + cdebootstrap_options + '\'')
cdebootstrap = subprocess.call('/usr/bin/cdebootstrap ' + cdebootstrap_options, shell=True)
cdebootstrap = subprocess.check_call('/usr/bin/cdebootstrap ' + cdebootstrap_options, shell=True)
# stage cache
if not os.path.exists('cache/bootstrap'):
......@@ -172,7 +172,7 @@ def main():
# Notes:
# * there's no Python equivalent to 'cp -a' that handels both symlinks and device nodes properly.
cache = subprocess.call('cp -a chroot cache/bootstrap', shell=True)
cache = subprocess.check_call('cp -a chroot cache/bootstrap', shell=True)
# stagefile
os.makedirs('.build', exist_ok=True)
......
......@@ -118,7 +118,7 @@ def main():
# Notes:
# * there's no Python equivalent to 'cp -a' that handels both symlinks and device nodes properly.
cache = subprocess.call('cp -a cache/bootstrap chroot', shell=True)
cache = subprocess.check_call('cp -a cache/bootstrap chroot', shell=True)
os.makedirs('.build', exist_ok=True)
open('.build/bootstrap', 'w').close()
......@@ -142,7 +142,7 @@ def main():
if verbose:
print('I: Calling \'/usr/sbin/debootstrap ' + debootstrap_options + '\'')
debootstrap = subprocess.call('/usr/sbin/debootstrap ' + debootstrap_options, shell=True)
debootstrap = subprocess.check_call('/usr/sbin/debootstrap ' + debootstrap_options, shell=True)
# package cache
if glob.glob('chroot/var/cache/apt/archives/*.deb'):
......@@ -169,7 +169,7 @@ def main():
# Notes:
# * there's no Python equivalent to 'cp -a' that handels both symlinks and device nodes properly.
cache = subprocess.call('cp -a chroot cache/bootstrap', shell=True)
cache = subprocess.check_call('cp -a chroot cache/bootstrap', shell=True)
# stagefile
os.makedirs('.build', exist_ok=True)
......
......@@ -72,8 +72,8 @@ def main():
os.makedirs('chroot/live-build/config', exist_ok=True)
mount = subprocess.call('mount -o bind config chroot/live-build/config', shell=True)
remount = subprocess.call('mount -o remount,ro,bind chroot/live-build/config', shell=True)
mount = subprocess.check_call('mount -o bind config chroot/live-build/config', shell=True)
remount = subprocess.check_call('mount -o remount,ro,bind chroot/live-build/config', shell=True)
# process hooks
os.makedirs('chroot/live-build', exist_ok=True)
......@@ -90,11 +90,11 @@ def main():
print('I: Executing \' ' + hook + '\'')
os.chmod(hook, 0o755)
exec_hook = subprocess.call('chroot chroot /live-build/' + os.path.basename(hook), shell=True)
exec_hook = subprocess.check_call('chroot chroot /live-build/' + os.path.basename(hook), shell=True)
os.remove('chroot/live-build/' + os.path.basename(hook))
# unmount coniguration directory
umount = subprocess.call('umount chroot/live-build/config', shell=True)
umount = subprocess.check_call('umount chroot/live-build/config', shell=True)
os.rmdir('chroot/live-build/config')
os.rmdir('chroot/live-build')
......
......@@ -83,13 +83,13 @@ def main():
if verbose:
print('I: Copying config/includes to chroot')
cpio = subprocess.call('cd config/includes && find . | cpio -dmpu --no-preserve-owner ../../chroot', shell=True)
cpio = subprocess.check_call('cd config/includes && find . | cpio -dmpu --no-preserve-owner ../../chroot', shell=True)
if glob.glob('config/includes.bootstrap/*') or glob.glob('config/includes.bootstrap/.*'):
if verbose:
print('I: Copying config/includes.bootstrap to chroot')
cpio = subprocess.call('cd config/includes.bootstrap && find . | cpio -dmpu --no-preserve-owner ../../chroot', shell=True)
cpio = subprocess.check_call('cd config/includes.bootstrap && find . | cpio -dmpu --no-preserve-owner ../../chroot', shell=True)
# stagefile
os.makedirs('.build', exist_ok=True)
......
......@@ -72,8 +72,8 @@ def main():
os.makedirs('chroot/live-build/config', exist_ok=True)
mount = subprocess.call('mount -o bind config chroot/live-build/config', shell=True)
remount = subprocess.call('mount -o remount,ro,bind chroot/live-build/config', shell=True)
mount = subprocess.check_call('mount -o bind config chroot/live-build/config', shell=True)
remount = subprocess.check_call('mount -o remount,ro,bind chroot/live-build/config', shell=True)
# process hooks
os.makedirs('chroot/live-build', exist_ok=True)
......@@ -90,11 +90,11 @@ def main():
print('I: Executing \' ' + hook + '\'')
os.chmod(hook, 0o755)
exec_hook = subprocess.call('chroot chroot /live-build/' + os.path.basename(hook), shell=True)
exec_hook = subprocess.check_call('chroot chroot /live-build/' + os.path.basename(hook), shell=True)
os.remove('chroot/live-build/' + os.path.basename(hook))
# unmount coniguration directory
umount = subprocess.call('umount chroot/live-build/config', shell=True)
umount = subprocess.check_call('umount chroot/live-build/config', shell=True)
os.rmdir('chroot/live-build/config')
os.rmdir('chroot/live-build')
......
......@@ -83,13 +83,13 @@ def main():
if verbose:
print('I: Copying config/includes to chroot')
cpio = subprocess.call('cd config/includes && find . | cpio -dmpu --no-preserve-owner ../../chroot', shell=True)
cpio = subprocess.check_call('cd config/includes && find . | cpio -dmpu --no-preserve-owner ../../chroot', shell=True)
if glob.glob('config/includes.chroot/*') or glob.glob('config/includes.chroot/.*'):
if verbose:
print('I: Copying config/includes.chroot to chroot')
cpio = subprocess.call('cd config/includes.chroot && find . | cpio -dmpu --no-preserve-owner ../../chroot', shell=True)
cpio = subprocess.check_call('cd config/includes.chroot && find . | cpio -dmpu --no-preserve-owner ../../chroot', shell=True)
# stagefile
os.makedirs('.build', exist_ok=True)
......
......@@ -72,8 +72,8 @@ def main():
os.makedirs('source/live-build/config', exist_ok=True)
mount = subprocess.call('mount -o bind config source/live-build/config', shell=True)
remount = subprocess.call('mount -o remount,ro,bind source/live-build/config', shell=True)
mount = subprocess.check_call('mount -o bind config source/live-build/config', shell=True)
remount = subprocess.check_call('mount -o remount,ro,bind source/live-build/config', shell=True)
# process hooks
os.makedirs('source/live-build', exist_ok=True)
......@@ -90,11 +90,11 @@ def main():
print('I: Executing \' ' + hook + '\'')
os.chmod(hook, 0o755)
exec_hook = subprocess.call('cd source && live-build/' + os.path.basename(hook), shell=True)
exec_hook = subprocess.check_call('cd source && live-build/' + os.path.basename(hook), shell=True)
os.remove('source/live-build/' + os.path.basename(hook))
# unmount coniguration directory
umount = subprocess.call('umount source/live-build/config', shell=True)
umount = subprocess.check_call('umount source/live-build/config', shell=True)
os.rmdir('source/live-build/config')
os.rmdir('source/live-build')
......
......@@ -84,13 +84,13 @@ def main():
if verbose:
print('I: Copying config/includes to source')
cpio = subprocess.call('cd config/includes && find . | cpio -dmpu --no-preserve-owner ../../source', shell=True)
cpio = subprocess.check_call('cd config/includes && find . | cpio -dmpu --no-preserve-owner ../../source', shell=True)
if glob.glob('config/includes.source/*') or glob.glob('config/includes.source/.*'):
if verbose:
print('I: Copying config/includes.source to source')
cpio = subprocess.call('cd config/includes.source && find . | cpio -dmpu --no-preserve-owner ../../source', shell=True)
cpio = subprocess.check_call('cd config/includes.source && find . | cpio -dmpu --no-preserve-owner ../../source', shell=True)
# stagefile
os.makedirs('.build', exist_ok=True)
......
squeeze
\ No newline at end of file
......@@ -78,6 +78,7 @@ else
# Standard options
LIVE_IMAGE_TYPE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])binary_images=[-a-z]+' | cut -f 2 -d '=' | head -n1)
LB_DISTRIBUTION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])distribution=[a-z]+' | cut -f 2 -d '=' | head -n1)
LB_APT=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])apt=[a-u]+' | cut -f 2 -d '=' | head -n1)
# Advanced bootstrap options
LIVE_IMAGE_ARCHITECTURE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])architectures=[0-9a-z]+' | cut -f 2 -d '=' | head -n1)
......@@ -135,6 +136,7 @@ else
-e "s/LIVE_IMAGE_TYPE/${LIVE_IMAGE_TYPE}/" \
-e "s/LB_DISTRIBUTION/${LB_DISTRIBUTION}/" \
-e "s#_LB_CONFIG#${_LB_CONFIG}#" \
-e "s/LB_APT/${LB_APT}/" \
-e "s/_LB_CGIPACKAGES/${_LB_CGIPACKAGES}/" \
-e "s/LIVE_IMAGE_ARCHITECTURE/${LIVE_IMAGE_ARCHITECTURE}/" \
-e "s/LIVE_IMAGE_ARCHIVE_AREAS/${LIVE_IMAGE_ARCHIVE_AREAS}/" \
......@@ -180,6 +182,7 @@ _LB_CONFIG="${_LB_CONFIG}"
# Standard options
LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE}"
LB_DISTRIBUTION="${LB_DISTRIBUTION}"
LB_APT="${LB_APT}"
# Advanced bootstrap options
LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE}"
......@@ -211,7 +214,7 @@ LB_SOURCE="${LB_SOURCE}"
EOF
echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: add web build (${_BUILD}) from ${REMOTE_ADDR}." >> /var/log/live/live-build-request
echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LIVE_IMAGE_TYPE}|distribution ${LB_DISTRIBUTION}|config ${_LB_CONFIG}|cgipackages ${_LB_CGIPACKAGES}|architectures ${LIVE_IMAGE_ARCHITECTURE}|archive_areas ${LIVE_IMAGE_ARCHIVE_AREAS}|chroot_filesystem ${LB_CHROOT_FILESYSTEM}|linux_flavours ${LB_LINUX_FLAVOURS}|security ${LB_SECURITY}|apt_indices ${LB_APT_INDICES}|bootappend_install ${LB_BOOTAPPEND_INSTALL}|bootappend_live ${LB_BOOTAPPEND_LIVE}|bootloader ${LB_BOOTLOADER}|debian_installer ${LB_DEBIAN_INSTALLER}|iso_application ${LB_ISO_APPLICATION}|iso_preparer ${LB_ISO_PREPARER}|iso_publisher ${LB_ISO_PUBLISHER}|iso_volume ${LB_ISO_VOLUME}|memtest ${LB_MEMTEST}|net_path ${LB_NET_ROOT_PATH}|net_server ${LB_NET_ROOT_SERVER}|source_images ${LB_SOURCE_IMAGES}|sources ${LB_SOURCE}" >> /var/log/live/live-build-request
echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LIVE_IMAGE_TYPE}|distribution ${LB_DISTRIBUTION}|config ${_LB_CONFIG}|apt ${LB_APT}|cgipackages ${_LB_CGIPACKAGES}|architectures ${LIVE_IMAGE_ARCHITECTURE}|archive_areas ${LIVE_IMAGE_ARCHIVE_AREAS}|chroot_filesystem ${LB_CHROOT_FILESYSTEM}|linux_flavours ${LB_LINUX_FLAVOURS}|security ${LB_SECURITY}|apt_indices ${LB_APT_INDICES}|bootappend_install ${LB_BOOTAPPEND_INSTALL}|bootappend_live ${LB_BOOTAPPEND_LIVE}|bootloader ${LB_BOOTLOADER}|debian_installer ${LB_DEBIAN_INSTALLER}|iso_application ${LB_ISO_APPLICATION}|iso_preparer ${LB_ISO_PREPARER}|iso_publisher ${LB_ISO_PUBLISHER}|iso_volume ${LB_ISO_VOLUME}|memtest ${LB_MEMTEST}|net_path ${LB_NET_ROOT_PATH}|net_server ${LB_NET_ROOT_SERVER}|source_images ${LB_SOURCE_IMAGES}|sources ${LB_SOURCE}" >> /var/log/live/live-build-request
fi
sed -e "s/VERSION/${VERSION}/" "${_TEMPLATES}"/footer.html
......@@ -102,7 +102,7 @@ then
then
cd "${_BUILD_PATH}"
# Do config with git and stack on config file params to build
lb config ${_CGI_CONFIG_APPEND} --distribution "${LB_DISTRIBUTION}" --binary-images "${LB_BINARY_IMAGES}" --architectures "${LIVE_IMAGE_ARCHITECTURE}" --archive-areas "${LIVE_IMAGE_ARCHIVE_AREAS}" --chroot-filesystem "${LB_CHROOT_FILESYSTEM}" --linux-flavours "${LB_LINUX_FLAVOURS}" --security "${LB_SECURITY}" --apt-indices "${LB_APT_INDICES}" --bootappend-install "${LB_BOOTAPPEND_INSTALL}" --bootappend-live "${LB_BOOTAPPEND_LIVE}" --bootloader "${LB_BOOTLOADER}" --debian-installer "${LB_DEBIAN_INSTALLER}" --iso-application "${LB_ISO_APPLICATION}" --iso-preparer "${LB_ISO_PREPARER}" --iso-publisher "${LB_ISO_PUBLISHER}" --iso-volume "${LB_ISO_VOLUME}" --memtest "${LB_MEMTEST}" --net-root-path "${LB_NET_ROOT_PATH}" --net-root-server "${LB_NET_ROOT_SERVER}" --source-images "${LB_SOURCE_IMAGES}" --source "${LB_SOURCE}"
lb config ${_CGI_CONFIG_APPEND} --apt "${LB_APT}" --distribution "${LB_DISTRIBUTION}" --binary-images "${LB_BINARY_IMAGES}" --architectures "${LIVE_IMAGE_ARCHITECTURE}" --archive-areas "${LIVE_IMAGE_ARCHIVE_AREAS}" --chroot-filesystem "${LB_CHROOT_FILESYSTEM}" --linux-flavours "${LB_LINUX_FLAVOURS}" --security "${LB_SECURITY}" --apt-indices "${LB_APT_INDICES}" --bootappend-install "${LB_BOOTAPPEND_INSTALL}" --bootappend-live "${LB_BOOTAPPEND_LIVE}" --bootloader "${LB_BOOTLOADER}" --debian-installer "${LB_DEBIAN_INSTALLER}" --iso-application "${LB_ISO_APPLICATION}" --iso-preparer "${LB_ISO_PREPARER}" --iso-publisher "${LB_ISO_PUBLISHER}" --iso-volume "${LB_ISO_VOLUME}" --memtest "${LB_MEMTEST}" --net-root-path "${LB_NET_ROOT_PATH}" --net-root-server "${LB_NET_ROOT_SERVER}" --source-images "${LB_SOURCE_IMAGES}" --source "${LB_SOURCE}"
_ERRORCONFIG="${?}"
else
echo "Config stage skipped. The git clone produced an error: ${_ERRORGIT}" >> "${_BUILD_PATH}"/log
......
......@@ -19,7 +19,7 @@ po4a.cfg:
update:
./bin/update-version.sh
build: po4a.cfg
build: check po4a.cfg
@if [ ! -x "$$(which po4a 2>/dev/null)" ]; \
then \
echo "E: po4a - command not found"; \
......@@ -28,7 +28,7 @@ build: po4a.cfg
exit 1; \
fi
po4a --keep 0 --package-name live-build po4a.cfg
po4a --keep 0 --package-name live-build --package-version $(shell cat ../VERSION) po4a.cfg
clean:
rm -f po/*/*.po~
......@@ -38,3 +38,19 @@ distclean: clean
rm -rf $(LANGUAGES)
rebuild: distclean update build
check:
@echo -n "Checking the integrity of .po files "
@if [ -x /usr/bin/msgfmt ]; \
then \
for POFILE in po/*/*; \
do \
msgfmt --check --output-file=/dev/null $${POFILE}; \
echo -n "."; \
done; \
else \
echo "WARNING: skipping po integrity check. You must install gettext."; \
fi
@echo " done!"
......@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 07.05.2014 4.0~alpha37\-1 "Live Systems Projekt"
.TH LIVE\-BUILD 1 25.06.2014 4.0~alpha38\-1 "Live Systems Projekt"
.SH NAME
\fBlive\-build\fP \- System Build Komponenten
......
......@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 07.05.2014 4.0~alpha37\-1 "Live Systems Projekt"
.TH LIVE\-BUILD 1 25.06.2014 4.0~alpha38\-1 "Live Systems Projekt"
.SH NAME
\fBlive\-build\fP \- System Build Komponenten
......
......@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 07.05.2014 4.0~alpha37\-1 "Live Systems Projekt"
.TH LIVE\-BUILD 1 25.06.2014 4.0~alpha38\-1 "Live Systems Projekt"
.SH NAME
\fBlive\-build\fP \- System Build Komponenten
......
......@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 07.05.2014 4.0~alpha37\-1 "Live Systems Projekt"
.TH LIVE\-BUILD 1 25.06.2014 4.0~alpha38\-1 "Live Systems Projekt"
.SH NAME
\fBlive\-build\fP \- System Build Komponenten
......
......@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 07.05.2014 4.0~alpha37\-1 "Live Systems Projekt"
.TH LIVE\-BUILD 1 25.06.2014 4.0~alpha38\-1 "Live Systems Projekt"
.SH NAME
\fBlive\-build\fP \- System Build Komponenten
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment