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 @@
.\" 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
\fBlive\-build\fP \- System Build Skripte
......
......@@ -11,7 +11,7 @@
.\" 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
\fBlive\-build\fP \- System Build Skripte
......
......@@ -6,7 +6,7 @@
.\" 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
\fBlive\-build\fR \- System Build Scripts
......
......@@ -6,7 +6,7 @@
.\" 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
\fBlive\-build\fR \- System Build Scripts
......
......@@ -11,7 +11,7 @@
.\" 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
\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 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
\fBlive\-build\fP \- Scripts de Creación del Sistema
......
......@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~a21-1\n"
"POT-Creation-Date: 2013-08-07 18:07+0300\n"
"Project-Id-Version: live-build 4.0~a22-1\n"
"POT-Creation-Date: 2013-09-05 17:30+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-08-07"
msgstr "07.08.2013"
msgid "2013-09-05"
msgstr "05.09.2013"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~a21-1"
msgstr "4.0~a21-1"
msgid "4.0~a22-1"
msgstr "4.0~a22-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~a21-1\n"
"POT-Creation-Date: 2013-08-07 18:07+0300\n"
"Project-Id-Version: live-build 4.0~a22-1\n"
"POT-Creation-Date: 2013-09-05 17:30+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-08-07"
msgstr "07.08.2013"
msgid "2013-09-05"
msgstr "05.09.2013"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~a21-1"
msgstr "4.0~a21-1"
msgid "4.0~a22-1"
msgstr "4.0~a22-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~a21-1\n"
"POT-Creation-Date: 2013-08-07 18:07+0300\n"
"Project-Id-Version: live-build 4.0~a22-1\n"
"POT-Creation-Date: 2013-09-05 17:30+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-08-07"
msgstr "07.08.2013"
msgid "2013-09-05"
msgstr "05.09.2013"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~a21-1"
msgstr "4.0~a21-1"
msgid "4.0~a22-1"
msgstr "4.0~a22-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~a21-1\n"
"POT-Creation-Date: 2013-08-07 18:07+0300\n"
"Project-Id-Version: live-build 4.0~a22-1\n"
"POT-Creation-Date: 2013-09-05 17:30+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-08-07"
msgstr "07.08.2013"
msgid "2013-09-05"
msgstr "05.09.2013"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~a21-1"
msgstr "4.0~a21-1"
msgid "4.0~a22-1"
msgstr "4.0~a22-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-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"
"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-08-07"
msgid "2013-09-05"
msgstr ""
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~a21-1"
msgid "4.0~a22-1"
msgstr ""
#. type: TH
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"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"
"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-08-07"
msgid "2013-09-05"
msgstr ""
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~a21-1"
msgid "4.0~a22-1"
msgstr ""
#. type: TH
......
......@@ -38,6 +38,18 @@ Check_lockfile .lock
# Creating lock file
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 || \
ls config/package-lists/*.list.binary > /dev/null 2>&1
then
......@@ -127,21 +139,21 @@ then
fi
# Install directory
mkdir -p binary/pool/${SECTION}/"${LETTER}"/"${SOURCE}"
mkdir -p binary/${POOL}/${SECTION}/"${LETTER}"/"${SOURCE}"
# Move files
mv "${FILE}" binary/pool/${SECTION}/"${LETTER}"/"${SOURCE}"
mv "${FILE}" binary/${POOL}/${SECTION}/"${LETTER}"/"${SOURCE}"
done
cd binary
for SECTION in pool/*
for SECTION in ${POOL}/*
do
SECTION="$(basename ${SECTION})"
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
gzip -9 -c dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages > dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages.gz
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
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
cd "${OLDPWD}"
......
......@@ -233,17 +233,14 @@ case "${LB_MODE}" in
progress-linux)
_PROJECT="Progress Linux"
if ls config/package-lists/client-gnome.list*
if ls config/package-lists/desktop-gnome.list*
then
_DESCRIPTION="Client GNOME"
elif ls config/package-lists/client-lxde.list* > /dev/null 2>&1
then
_DESCRIPTION="Client LXDE"
_DESCRIPTION="Desktop GNOME"
elif ls config/package-lists/server-lxc.list* > /dev/null 2>&1
then
_DESCRIPTION="Server LXC"
else
_DESCRIPTION="Standard"
_DESCRIPTION="Base System"
fi
;;
......@@ -251,7 +248,6 @@ case "${LB_MODE}" in
_PROJECT="Debian GNU/Linux"
_DESCRIPTION=""
;;
esac
for _FILE in "${_TARGET}"/*.cfg ${_TARGET}/*.svg
......
......@@ -401,7 +401,7 @@ then
;;
esac
DI_PACKAGES="${DI_PACKAGES} busybox cryptsetup mdadm lvm2"
DI_PACKAGES="${DI_PACKAGES} busybox cryptsetup mdadm lvm2 xfsprogs jfsutils"
case "${LB_MODE}" in
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