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

Adding upstream version 4.0~a22.

parent 4670b556
4.0~a21-1 4.0~a22-1
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file. .\" This file was generated with po4a. Translate the source file.
.\" .\"
.\"******************************************************************* .\"*******************************************************************
.TH LIVE\-BUILD 1 07.08.2013 4.0~a21\-1 "Live Systems Projekt" .TH LIVE\-BUILD 1 05.09.2013 4.0~a22\-1 "Live Systems Projekt"
.SH NAME .SH NAME
\fBlive\-build\fP \- System Build Skripte \fBlive\-build\fP \- System Build Skripte
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file. .\" This file was generated with po4a. Translate the source file.
.\" .\"
.\"******************************************************************* .\"*******************************************************************
.TH LIVE\-BUILD 1 07.08.2013 4.0~a21\-1 "Live Systems Projekt" .TH LIVE\-BUILD 1 05.09.2013 4.0~a22\-1 "Live Systems Projekt"
.SH NAME .SH NAME
\fBlive\-build\fP \- System Build Skripte \fBlive\-build\fP \- System Build Skripte
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details. .\" under certain conditions; see COPYING for details.
.\" .\"
.\" .\"
.TH LIVE\-BUILD 1 2013\-08\-07 4.0~a21-1 "Live Systems Project" .TH LIVE\-BUILD 1 2013\-09\-05 4.0~a22-1 "Live Systems Project"
.SH NAME .SH NAME
\fBlive\-build\fR \- System Build Scripts \fBlive\-build\fR \- System Build Scripts
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details. .\" under certain conditions; see COPYING for details.
.\" .\"
.\" .\"
.TH LIVE\-BUILD 1 2013\-08\-07 4.0~a21-1 "Live Systems Project" .TH LIVE\-BUILD 1 2013\-09\-05 4.0~a22-1 "Live Systems Project"
.SH NAME .SH NAME
\fBlive\-build\fR \- System Build Scripts \fBlive\-build\fR \- System Build Scripts
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file. .\" This file was generated with po4a. Translate the source file.
.\" .\"
.\"******************************************************************* .\"*******************************************************************
.TH LIVE\-BUILD 1 07.08.2013 4.0~a21\-1 "Proyecto Live Systems" .TH LIVE\-BUILD 1 05.09.2013 4.0~a22\-1 "Proyecto Live Systems"
.SH NOMBRE .SH NOMBRE
\fBlive\-build\fP \- Scripts de Creación del Sistema \fBlive\-build\fP \- Scripts de Creación del Sistema
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file. .\" This file was generated with po4a. Translate the source file.
.\" .\"
.\"******************************************************************* .\"*******************************************************************
.TH LIVE\-BUILD 1 07.08.2013 4.0~a21\-1 "Proyecto Live Systems" .TH LIVE\-BUILD 1 05.09.2013 4.0~a22\-1 "Proyecto Live Systems"
.SH NOMBRE .SH NOMBRE
\fBlive\-build\fP \- Scripts de Creación del Sistema \fBlive\-build\fP \- Scripts de Creación del Sistema
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build 4.0~a21-1\n" "Project-Id-Version: live-build 4.0~a22-1\n"
"POT-Creation-Date: 2013-08-07 18:07+0300\n" "POT-Creation-Date: 2013-09-05 17:30+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n" "PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n" "Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
"Language-Team: none\n" "Language-Team: none\n"
...@@ -24,14 +24,14 @@ msgstr "LIVE-BUILD" ...@@ -24,14 +24,14 @@ msgstr "LIVE-BUILD"
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap #, no-wrap
msgid "2013-08-07" msgid "2013-09-05"
msgstr "07.08.2013" msgstr "05.09.2013"
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap #, no-wrap
msgid "4.0~a21-1" msgid "4.0~a22-1"
msgstr "4.0~a21-1" msgstr "4.0~a22-1"
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build 4.0~a21-1\n" "Project-Id-Version: live-build 4.0~a22-1\n"
"POT-Creation-Date: 2013-08-07 18:07+0300\n" "POT-Creation-Date: 2013-09-05 17:30+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n" "PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n" "Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
"Language-Team: none\n" "Language-Team: none\n"
...@@ -24,14 +24,14 @@ msgstr "LIVE-BUILD" ...@@ -24,14 +24,14 @@ msgstr "LIVE-BUILD"
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap #, no-wrap
msgid "2013-08-07" msgid "2013-09-05"
msgstr "07.08.2013" msgstr "05.09.2013"
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap #, no-wrap
msgid "4.0~a21-1" msgid "4.0~a22-1"
msgstr "4.0~a21-1" msgstr "4.0~a22-1"
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build 4.0~a21-1\n" "Project-Id-Version: live-build 4.0~a22-1\n"
"POT-Creation-Date: 2013-08-07 18:07+0300\n" "POT-Creation-Date: 2013-09-05 17:30+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n" "PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n" "Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n" "Language-Team: none\n"
...@@ -23,14 +23,14 @@ msgstr "LIVE-BUILD" ...@@ -23,14 +23,14 @@ msgstr "LIVE-BUILD"
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap #, no-wrap
msgid "2013-08-07" msgid "2013-09-05"
msgstr "07.08.2013" msgstr "05.09.2013"
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap #, no-wrap
msgid "4.0~a21-1" msgid "4.0~a22-1"
msgstr "4.0~a21-1" msgstr "4.0~a22-1"
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build 4.0~a21-1\n" "Project-Id-Version: live-build 4.0~a22-1\n"
"POT-Creation-Date: 2013-08-07 18:07+0300\n" "POT-Creation-Date: 2013-09-05 17:30+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n" "PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n" "Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n" "Language-Team: none\n"
...@@ -23,14 +23,14 @@ msgstr "LIVE-BUILD" ...@@ -23,14 +23,14 @@ msgstr "LIVE-BUILD"
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap #, no-wrap
msgid "2013-08-07" msgid "2013-09-05"
msgstr "07.08.2013" msgstr "05.09.2013"
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap #, no-wrap
msgid "4.0~a21-1" msgid "4.0~a22-1"
msgstr "4.0~a21-1" msgstr "4.0~a22-1"
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build VERSION\n" "Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2013-08-07 18:07+0300\n" "POT-Creation-Date: 2013-09-05 17:30+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -25,13 +25,13 @@ msgstr "" ...@@ -25,13 +25,13 @@ msgstr ""
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap #, no-wrap
msgid "2013-08-07" msgid "2013-09-05"
msgstr "" msgstr ""
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap #, no-wrap
msgid "4.0~a21-1" msgid "4.0~a22-1"
msgstr "" msgstr ""
#. type: TH #. type: TH
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build VERSION\n" "Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2013-08-07 18:07+0300\n" "POT-Creation-Date: 2013-09-05 17:30+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -25,13 +25,13 @@ msgstr "" ...@@ -25,13 +25,13 @@ msgstr ""
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap #, no-wrap
msgid "2013-08-07" msgid "2013-09-05"
msgstr "" msgstr ""
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap #, no-wrap
msgid "4.0~a21-1" msgid "4.0~a22-1"
msgstr "" msgstr ""
#. type: TH #. type: TH
......
...@@ -38,6 +38,18 @@ Check_lockfile .lock ...@@ -38,6 +38,18 @@ Check_lockfile .lock
# Creating lock file # Creating lock file
Create_lockfile .lock Create_lockfile .lock
case "${LB_MODE}" in
progress-linux)
DISTS="installer/dists"
POOL="installer/pool"
;;
*)
DISTS="dists"
POOL="pool"
;;
esac
if ls config/package-lists/*.list > /dev/null 2>&1 || \ if ls config/package-lists/*.list > /dev/null 2>&1 || \
ls config/package-lists/*.list.binary > /dev/null 2>&1 ls config/package-lists/*.list.binary > /dev/null 2>&1
then then
...@@ -127,21 +139,21 @@ then ...@@ -127,21 +139,21 @@ then
fi fi
# Install directory # Install directory
mkdir -p binary/pool/${SECTION}/"${LETTER}"/"${SOURCE}" mkdir -p binary/${POOL}/${SECTION}/"${LETTER}"/"${SOURCE}"
# Move files # Move files
mv "${FILE}" binary/pool/${SECTION}/"${LETTER}"/"${SOURCE}" mv "${FILE}" binary/${POOL}/${SECTION}/"${LETTER}"/"${SOURCE}"
done done
cd binary cd binary
for SECTION in pool/* for SECTION in ${POOL}/*
do do
SECTION="$(basename ${SECTION})" SECTION="$(basename ${SECTION})"
mkdir -p dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE} mkdir -p ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}
apt-ftparchive packages pool/${SECTION} > dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages apt-ftparchive packages ${POOL}/${SECTION} > ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages
gzip -9 -c dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages > dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages.gz gzip -9 -c ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages > ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages.gz
done done
cd "${OLDPWD}" cd "${OLDPWD}"
......
...@@ -233,17 +233,14 @@ case "${LB_MODE}" in ...@@ -233,17 +233,14 @@ case "${LB_MODE}" in
progress-linux) progress-linux)
_PROJECT="Progress Linux" _PROJECT="Progress Linux"
if ls config/package-lists/client-gnome.list* if ls config/package-lists/desktop-gnome.list*
then then
_DESCRIPTION="Client GNOME" _DESCRIPTION="Desktop GNOME"
elif ls config/package-lists/client-lxde.list* > /dev/null 2>&1
then
_DESCRIPTION="Client LXDE"
elif ls config/package-lists/server-lxc.list* > /dev/null 2>&1 elif ls config/package-lists/server-lxc.list* > /dev/null 2>&1
then then
_DESCRIPTION="Server LXC" _DESCRIPTION="Server LXC"
else else
_DESCRIPTION="Standard" _DESCRIPTION="Base System"
fi fi
;; ;;
...@@ -251,7 +248,6 @@ case "${LB_MODE}" in ...@@ -251,7 +248,6 @@ case "${LB_MODE}" in
_PROJECT="Debian GNU/Linux" _PROJECT="Debian GNU/Linux"
_DESCRIPTION="" _DESCRIPTION=""
;; ;;
esac esac
for _FILE in "${_TARGET}"/*.cfg ${_TARGET}/*.svg for _FILE in "${_TARGET}"/*.cfg ${_TARGET}/*.svg
......
...@@ -401,7 +401,7 @@ then ...@@ -401,7 +401,7 @@ then
;; ;;
esac esac
DI_PACKAGES="${DI_PACKAGES} busybox cryptsetup mdadm lvm2" DI_PACKAGES="${DI_PACKAGES} busybox cryptsetup mdadm lvm2 xfsprogs jfsutils"
case "${LB_MODE}" in case "${LB_MODE}" in
debian) debian)
......
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