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

Adding upstream version 4.0~a18.

parent f632dc97
4.0~a17-1
4.0~a18-1
......@@ -371,7 +371,7 @@ Set_defaults ()
progress-linux)
LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-http://ftp.debian.org/debian/}"
LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://cdn.archive.progress-linux.org/progress/}"
LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://cdn.archive.progress-linux.org/packages/}"
;;
ubuntu)
......@@ -507,7 +507,8 @@ Set_defaults ()
remove-openssh-server-host-keys \
remove-python-py \
remove-temporary-files \
remove-udev-persistent-rules \
remove-udev-persistent-cd-rules \
remove-udev-persistent-net-rules \
remove-systemd-machine-id \
update-apt-file-cache \
update-apt-xapian-index \
......@@ -673,7 +674,7 @@ Set_defaults ()
# Setting updates updates option
case "${LB_PARENT_DISTRIBUTION}" in
wheezy|jessie|sid)
jessie|sid)
LB_UPDATES="${LB_UPDATES:-false}"
;;
......
......@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 08.04.2013 4.0~a17\-1 "Live Systems Projekt"
.TH LIVE\-BUILD 1 06.05.2013 4.0~a18\-1 "Live Systems Projekt"
.SH NAME
\fBlive\-build\fP \- System Build Skripte
......
......@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 08.04.2013 4.0~a17\-1 "Live Systems Projekt"
.TH LIVE\-BUILD 1 06.05.2013 4.0~a18\-1 "Live Systems Projekt"
.SH NAME
\fBlive\-build\fP \- System Build Skripte
......
......@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details.
.\"
.\"
.TH LIVE\-BUILD 1 2013\-04\-08 4.0~a17-1 "Live Systems Project"
.TH LIVE\-BUILD 1 2013\-05\-06 4.0~a18-1 "Live Systems Project"
.SH NAME
\fBlive\-build\fR \- System Build Scripts
......
......@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details.
.\"
.\"
.TH LIVE\-BUILD 1 2013\-04\-08 4.0~a17-1 "Live Systems Project"
.TH LIVE\-BUILD 1 2013\-05\-06 4.0~a18-1 "Live Systems Project"
.SH NAME
\fBlive\-build\fR \- System Build Scripts
......
......@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 08.04.2013 4.0~a17\-1 "Proyecto Live Systems"
.TH LIVE\-BUILD 1 06.05.2013 4.0~a18\-1 "Proyecto Live Systems"
.SH NOMBRE
\fBlive\-build\fP \- Scripts de Creación del Sistema
......
......@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 08.04.2013 4.0~a17\-1 "Proyecto Live Systems"
.TH LIVE\-BUILD 1 06.05.2013 4.0~a18\-1 "Proyecto Live Systems"
.SH NOMBRE
\fBlive\-build\fP \- Scripts de Creación del Sistema
......
......@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~a17-1\n"
"POT-Creation-Date: 2013-04-08 22:19+0300\n"
"Project-Id-Version: live-build 4.0~a18-1\n"
"POT-Creation-Date: 2013-05-06 20:08+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
"Language-Team: none\n"
......@@ -24,14 +24,14 @@ msgstr "LIVE-BUILD"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "2013-04-08"
msgstr "08.04.2013"
msgid "2013-05-06"
msgstr "06.05.2013"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~a17-1"
msgstr "4.0~a17-1"
msgid "4.0~a18-1"
msgstr "4.0~a18-1"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
......
......@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~a17-1\n"
"POT-Creation-Date: 2013-04-08 22:19+0300\n"
"Project-Id-Version: live-build 4.0~a18-1\n"
"POT-Creation-Date: 2013-05-06 20:08+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
"Language-Team: none\n"
......@@ -24,14 +24,14 @@ msgstr "LIVE-BUILD"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "2013-04-08"
msgstr "08.04.2013"
msgid "2013-05-06"
msgstr "06.05.2013"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~a17-1"
msgstr "4.0~a17-1"
msgid "4.0~a18-1"
msgstr "4.0~a18-1"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
......
......@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~a17-1\n"
"POT-Creation-Date: 2013-04-08 22:19+0300\n"
"Project-Id-Version: live-build 4.0~a18-1\n"
"POT-Creation-Date: 2013-05-06 20:08+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
......@@ -23,14 +23,14 @@ msgstr "LIVE-BUILD"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "2013-04-08"
msgstr "08.04.2013"
msgid "2013-05-06"
msgstr "06.05.2013"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~a17-1"
msgstr "4.0~a17-1"
msgid "4.0~a18-1"
msgstr "4.0~a18-1"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
......
......@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~a17-1\n"
"POT-Creation-Date: 2013-04-08 22:19+0300\n"
"Project-Id-Version: live-build 4.0~a18-1\n"
"POT-Creation-Date: 2013-05-06 20:08+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
......@@ -23,14 +23,14 @@ msgstr "LIVE-BUILD"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "2013-04-08"
msgstr "08.04.2013"
msgid "2013-05-06"
msgstr "06.05.2013"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~a17-1"
msgstr "4.0~a17-1"
msgid "4.0~a18-1"
msgstr "4.0~a18-1"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2013-04-08 22:19+0300\n"
"POT-Creation-Date: 2013-05-06 20:08+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "2013-04-08"
msgid "2013-05-06"
msgstr ""
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~a17-1"
msgid "4.0~a18-1"
msgstr ""
#. type: TH
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2013-04-08 22:19+0300\n"
"POT-Creation-Date: 2013-05-06 20:08+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "2013-04-08"
msgid "2013-05-06"
msgstr ""
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~a17-1"
msgid "4.0~a18-1"
msgstr ""
#. type: TH
......
......@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if [ "${LB_LOADLIN}" != "true" ]
if [ "${LB_LOADLIN}" != "true" ] || [ "${LB_BINARY_IMAGES}" = "netboot" ]
then
exit 0
fi
......
......@@ -67,5 +67,7 @@ echo "$(diff chroot.packages.live chroot.packages.install | awk '/^< / { print $
cp chroot.packages.live ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.packages
cp chroot.files ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.files
# Creating stage file
Create_stagefile .build/binary_manifest
......@@ -145,13 +145,13 @@ Install_package
# Copying files
case "${LB_BUILD_WITH_CHROOT}" in
true)
mkdir -p $(dirname ${_TARGET})
mkdir -p ${_TARGET}
# Copy in two steps since the theme can have absolute symlinks and would therefore not be dereferenced correctly
cp -a ${_SOURCE} chroot/root
Chroot chroot cp -aL /root/$(basename ${_SOURCE}) /root/$(basename ${_SOURCE}).tmp || true
rm -rf chroot/root/$(basename ${_SOURCE})
mv chroot/root/$(basename ${_SOURCE}).tmp ${_TARGET}
cp -a chroot/root/$(basename ${_SOURCE}).tmp/* ${_TARGET}
rm -rf chroot/root/$(basename ${_SOURCE}) chroot/root/$(basename ${_SOURCE}).tmp
;;
false)
......
......@@ -32,16 +32,28 @@ Set_defaults
case "${LB_MODE}" in
progress-linux)
case "${LB_DISTRIBUTION}" in
artax*)
_KEYS="1.0-artax 1.0-artax-packages"
artax)
_KEYS="1.0-artax"
;;
baureo*)
_KEYS="2.0-baureo 2.0-baureo-packages"
artax-backports)
_KEYS="1.0-artax 1.9-artax-backports"
;;
chairon*)
_KEYS="3.0-chairon 3.0-chairon-packages"
baureo)
_KEYS="2.0-baureo"
;;
baureo-backports)
_KEYS="2.0-baureo 2.9-baureo-backports"
;;
chairon)
_KEYS="3.0-chairon"
;;
chairon-backports)
_KEYS="3.0-chairon 3.9-chairon-backports"
;;
esac
......@@ -56,13 +68,39 @@ do
wget -q "${_URL}/archive-key-${_KEY}.asc" -O chroot/key.asc
wget -q "${_URL}/archive-key-${_KEY}.asc.sig" -O chroot/key.asc.sig
if [ -e /usr/bin/gpgv ] && [ -e /usr/share/keyrings/debian-keyring.gpg ]
if [ -e /usr/bin/gpgv ]
then
Echo_message "Verifying archive-key ${_KEY} against debian-keyring..."
/usr/bin/gpgv --quiet --keyring /usr/share/keyrings/debian-keyring.gpg chroot/key.asc.sig chroot/key.asc > /dev/null 2>&1 || { Echo_error "archive-key ${_KEY} has invalid signature."; return 1;}
if [ -e /usr/share/keyrings/debian-keyring.gpg ] || [ -e /usr/share/keyrings/debian-maintainers.gpg ]
then
_KEY_VALID=""
for _KEYRING in /usr/share/keyrings/debian-keyring.gpg /usr/share/keyrings/debian-maintainers.gpg
do
if [ -e "${_KEYRING}" ]
then
Echo_message "Verifying archive-key ${_KEY} against $(basename ${_KEYRING} .gpg | sed -e 's|-keyring||') keyring..."
set +e
/usr/bin/gpgv --quiet --keyring ${_KEYRING} chroot/key.asc.sig chroot/key.asc > /dev/null 2>&1 && _KEY_VALID="true" && break
set -e
fi
done
case "${_KEY_VALID}" in
true)
Echo_message "Verifying ${_KEY} signature successful."
;;
*)
Echo_error "Verifying ${_KEY} signature failed."
return 1
;;
esac
else
Echo_warning "Skipping archive-key ${_KEY} verification, debian-keyring not available..."
fi
else
Echo_warning "Skipping archive-key ${_KEY} verification, either gpgv or debian-keyring not available on host system..."
Echo_warning "Skipping archive-key ${_KEY} verification, gpgv not available..."
fi
Echo_message "Importing archive-key ${_KEY}..."
......
......@@ -20,6 +20,8 @@ import subprocess
# TODO:
# - lockfile handling
# - cdebootstrap-options from config
# - use gettext for i18n
# - take mirrors from config/archives/debian.{bootstrap,chroot}
def main():
## Parsing Arguments
......
......@@ -20,6 +20,8 @@ import subprocess
# TODO:
# - lockfile handling
# - debootstrap-options from config
# - use gettext for i18n
# - take mirrors from config/archives/debian.{bootstrap,chroot}
def main():
## Parsing Arguments
......
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