Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
tails
live-build
Commits
5092592c
Commit
5092592c
authored
Sep 18, 2013
by
Daniel Baumann
Browse files
Adding upstream version 4.0~alpha25.
parent
bf43bb90
Changes
16
Hide whitespace changes
Inline
Side-by-side
VERSION
View file @
5092592c
4.0~a
24
-1
4.0~a
lpha25
-1
frontend/cgi/live-build-cgi
View file @
5092592c
...
...
@@ -210,8 +210,8 @@ 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
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
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
fi
sed
-e
"s/VERSION/
${
VERSION
}
/"
"
${
_TEMPLATES
}
"
/footer.html
frontend/cgi/live-build-cgi.cron
View file @
5092592c
...
...
@@ -54,7 +54,7 @@ if ls "${_DESTDIR}"/`date -d yesterday +%Y%m%d.%H`* > /dev/null 2>&1
then
rm
-rf
"
${
_DESTDIR
}
"
/
`
date
-d
yesterday +%Y%m%d.%H
`
*
echo
"
`
date
+%b
\
%d
\
%H:%M:%S
`
${
_HOSTNAME
}
live-build-cgi: remove web build (
`
date
-d
yesterday +%Y%m%d.%H
`
*)."
>>
/var/log/live
echo
"
`
date
+%b
\
%d
\
%H:%M:%S
`
${
_HOSTNAME
}
live-build-cgi: remove web build (
`
date
-d
yesterday +%Y%m%d.%H
`
*)."
>>
/var/log/live
/live-build
fi
# Ok from here spin through the live-build-cgi files we have waiting to build
...
...
@@ -66,10 +66,10 @@ then
.
"
${
_FILE
}
"
# Drop out some build data for information if something goes wrong.
echo
"
`
date
+%b
\
%d
\
%H:%M:%S
`
${
_HOSTNAME
}
live-build-cgi: begin web build (
${
_BUILD
}
)."
>>
/var/log/live
echo
"
`
date
+%b
\
%d
\
%H:%M:%S
`
${
_HOSTNAME
}
live-build-cgi: begin web build (
${
_BUILD
}
)."
>>
/var/log/live
/live-build
# Clone the git config to target build directory
git clone
${
_LB_GIT
}
"
${
_TEMPDIR
}
"
/
"
${
_BUILD
}
"
>>
/var/log/live
git clone
${
_LB_GIT
}
"
${
_TEMPDIR
}
"
/
"
${
_BUILD
}
"
>>
/var/log/live
/live-build
_ERRORGIT
=
"
${
?
}
"
# Moving build file to the tempdir and remove from submission area.
...
...
@@ -129,10 +129,10 @@ then
if
[
"
${
_ERRORGIT
}
"
-eq
"0"
]
&&
[
"
${
_ERRORCONFIG
}
"
-eq
"0"
]
&&
[
"
${
_ERRORBUILD
}
"
-eq
"0"
]
then
_STATUS
=
"maybe-successful"
echo
"
${
REMOTE_ADDR
}
- -
`
date
+[%d/%b/%Y:%H:%m:%S
\
%z]
`
\"
${
_BUILD
}
${
LIVE_IMAGE_ARCHITECTURE
}
/
${
LB_DISTRIBUTION
}
/
${
_LB_CGIPACKAGES
}
\"
200 -
\"
-
\"
\"\"
"
>>
/var/log/live
-cgi.build
s
echo
"
${
REMOTE_ADDR
}
- -
`
date
+[%d/%b/%Y:%H:%m:%S
\
%z]
`
\"
${
_BUILD
}
${
LIVE_IMAGE_ARCHITECTURE
}
/
${
LB_DISTRIBUTION
}
/
${
_LB_CGIPACKAGES
}
\"
200 -
\"
-
\"
\"\"
"
>>
/var/log/live
/live-build-cgi-statu
s
else
_STATUS
=
"maybe-failed"
echo
"
${
REMOTE_ADDR
}
- -
`
date
+[%d/%b/%Y:%H:%m:%S
\
%z]
`
\"
${
_BUILD
}
${
LIVE_IMAGE_ARCHITECTURE
}
/
${
LB_DISTRIBUTION
}
/
${
_LB_CGIPACKAGES
}
\"
404 -
\"
-
\"
\"\"
"
>>
/var/log/live
-cgi.build
s
echo
"
${
REMOTE_ADDR
}
- -
`
date
+[%d/%b/%Y:%H:%m:%S
\
%z]
`
\"
${
_BUILD
}
${
LIVE_IMAGE_ARCHITECTURE
}
/
${
LB_DISTRIBUTION
}
/
${
_LB_CGIPACKAGES
}
\"
404 -
\"
-
\"
\"\"
"
>>
/var/log/live
/live-build-cgi-statu
s
fi
sed
-e
"s/BUILD/
${
_BUILD
}
/g"
\
...
...
@@ -204,5 +204,5 @@ EOF
# Removing build directory
rm
-rf
"
${
_TEMPDIR
}
"
/
"
${
_BUILD
}
"
echo
"
`
date
+%b
\
%d
\
%H:%M:%S
`
${
_HOSTNAME
}
live-build-cgi: end web build (
${
_BUILD
}
:
${
_STATUS
}
)."
>>
/var/log/live
echo
"
`
date
+%b
\
%d
\
%H:%M:%S
`
${
_HOSTNAME
}
live-build-cgi: end web build (
${
_BUILD
}
:
${
_STATUS
}
)."
>>
/var/log/live
/live-build
fi
manpages/de/lb_bootstrap_cdebootstrap.de.1
View file @
5092592c
...
...
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1
06
.09.2013 4.0~a
24
\-1 "Live Systems Projekt"
.TH LIVE\-BUILD 1
18
.09.2013 4.0~a
lpha25
\-1 "Live Systems Projekt"
.SH NAME
\fBlive\-build\fP \- System Build Skripte
...
...
manpages/de/lb_bootstrap_debootstrap.de.1
View file @
5092592c
...
...
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1
06
.09.2013 4.0~a
24
\-1 "Live Systems Projekt"
.TH LIVE\-BUILD 1
18
.09.2013 4.0~a
lpha25
\-1 "Live Systems Projekt"
.SH NAME
\fBlive\-build\fP \- System Build Skripte
...
...
manpages/en/lb_bootstrap_cdebootstrap.1
View file @
5092592c
...
...
@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details.
.\"
.\"
.TH LIVE\-BUILD 1 2013\-09\-
06
4.0~a
24
-1 "Live Systems Project"
.TH LIVE\-BUILD 1 2013\-09\-
18
4.0~a
lpha25
-1 "Live Systems Project"
.SH NAME
\fBlive\-build\fR \- System Build Scripts
...
...
manpages/en/lb_bootstrap_debootstrap.1
View file @
5092592c
...
...
@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details.
.\"
.\"
.TH LIVE\-BUILD 1 2013\-09\-
06
4.0~a
24
-1 "Live Systems Project"
.TH LIVE\-BUILD 1 2013\-09\-
18
4.0~a
lpha25
-1 "Live Systems Project"
.SH NAME
\fBlive\-build\fR \- System Build Scripts
...
...
manpages/es/lb_bootstrap_cdebootstrap.es.1
View file @
5092592c
...
...
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1
06
.09.2013 4.0~a
24
\-1 "Proyecto Live Systems"
.TH LIVE\-BUILD 1
18
.09.2013 4.0~a
lpha25
\-1 "Proyecto Live Systems"
.SH NOMBRE
\fBlive\-build\fP \- Scripts de Creación del Sistema
...
...
manpages/es/lb_bootstrap_debootstrap.es.1
View file @
5092592c
...
...
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1
06
.09.2013 4.0~a
24
\-1 "Proyecto Live Systems"
.TH LIVE\-BUILD 1
18
.09.2013 4.0~a
lpha25
\-1 "Proyecto Live Systems"
.SH NOMBRE
\fBlive\-build\fP \- Scripts de Creación del Sistema
...
...
manpages/po/de/lb_bootstrap_cdebootstrap.1.po
View file @
5092592c
...
...
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~a
24
-1\n"
"POT-Creation-Date: 2013-09-
06 20:05
+0300\n"
"Project-Id-Version: live-build 4.0~a
lpha25
-1\n"
"POT-Creation-Date: 2013-09-
18 10:24
+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-09-
06
"
msgstr "
06
.09.2013"
msgid "2013-09-
18
"
msgstr "
18
.09.2013"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~a
24
-1"
msgstr "4.0~a
24
-1"
msgid "4.0~a
lpha25
-1"
msgstr "4.0~a
lpha25
-1"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
...
...
manpages/po/de/lb_bootstrap_debootstrap.1.po
View file @
5092592c
...
...
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~a
24
-1\n"
"POT-Creation-Date: 2013-09-
06 20:05
+0300\n"
"Project-Id-Version: live-build 4.0~a
lpha25
-1\n"
"POT-Creation-Date: 2013-09-
18 10:24
+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-09-
06
"
msgstr "
06
.09.2013"
msgid "2013-09-
18
"
msgstr "
18
.09.2013"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~a
24
-1"
msgstr "4.0~a
24
-1"
msgid "4.0~a
lpha25
-1"
msgstr "4.0~a
lpha25
-1"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
...
...
manpages/po/es/lb_bootstrap_cdebootstrap.1.po
View file @
5092592c
...
...
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~a
24
-1\n"
"POT-Creation-Date: 2013-09-
06 20:05
+0300\n"
"Project-Id-Version: live-build 4.0~a
lpha25
-1\n"
"POT-Creation-Date: 2013-09-
18 10:24
+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-09-
06
"
msgstr "
06
.09.2013"
msgid "2013-09-
18
"
msgstr "
18
.09.2013"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~a
24
-1"
msgstr "4.0~a
24
-1"
msgid "4.0~a
lpha25
-1"
msgstr "4.0~a
lpha25
-1"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
...
...
manpages/po/es/lb_bootstrap_debootstrap.1.po
View file @
5092592c
...
...
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~a
24
-1\n"
"POT-Creation-Date: 2013-09-
06 20:05
+0300\n"
"Project-Id-Version: live-build 4.0~a
lpha25
-1\n"
"POT-Creation-Date: 2013-09-
18 10:24
+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-09-
06
"
msgstr "
06
.09.2013"
msgid "2013-09-
18
"
msgstr "
18
.09.2013"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~a
24
-1"
msgstr "4.0~a
24
-1"
msgid "4.0~a
lpha25
-1"
msgstr "4.0~a
lpha25
-1"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
...
...
manpages/pot/lb_bootstrap_cdebootstrap.1.pot
View file @
5092592c
...
...
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2013-09-
06 20:05
+0300\n"
"POT-Creation-Date: 2013-09-
18 10:24
+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-09-
06
"
msgid "2013-09-
18
"
msgstr ""
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~a
24
-1"
msgid "4.0~a
lpha25
-1"
msgstr ""
#. type: TH
...
...
manpages/pot/lb_bootstrap_debootstrap.1.pot
View file @
5092592c
...
...
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2013-09-
06 20:05
+0300\n"
"POT-Creation-Date: 2013-09-
18 10:24
+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-09-
06
"
msgid "2013-09-
18
"
msgstr ""
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~a
24
-1"
msgid "4.0~a
lpha25
-1"
msgstr ""
#. type: TH
...
...
scripts/build/source_debian
View file @
5092592c
...
...
@@ -116,15 +116,19 @@ case "${LB_MODE}" in
;;
*
)
if
grep
-qs
"-backports"
chroot
/etc/apt/sources.list.d/progress-linux.list
if
grep
-qs
"
${
LB_DISTRIBUTION
}
-backports"
chroot
/etc/apt/sources.list.d/progress-linux.list
then
cp chroot
/etc/apt/sources.list.d/progress-linux.list
chroot
/etc/apt/sources.list.d/progress-linux.list.orig
while
read
_LINE
do
if
echo
"
${
_LINE
}
"
|
grep
-qs
${
LB_DISTRIBUTION
}
-backports
then
sed
-i
-e
"s|
${
_LINE
}
|#
${
_LINE
}
|"
chroot
/etc/apt/sources.list.d/progress-linux.list
fi
done
<
chroot
/etc/apt/sources.list.d/progress-linux.list
done
<
chroot
/etc/apt/sources.list.d/progress-linux.list.orig
Apt
chroot
update
fi
;;
esac
...
...
@@ -183,5 +187,13 @@ do
mv chroot
/
"
${
SOURCE
}
"
_
*
source
/debian/
"
${
LETTER
}
"
/
"
${
SOURCE
}
"
done
# Reverting apt sources again
if
[
-e
chroot
/etc/apt/sources.list.d/progress-linux.list.orig
]
then
mv chroot
/etc/apt/sources.list.d/progress-linux.list.orig
chroot
/etc/apt/sources.list.d/progress-linux.list
Apt
chroot
update
fi
# Creating stage file
Create_stagefile .build/source_debian
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment