README and bugfix

This commit is contained in:
Kload 2013-06-23 19:09:39 +00:00
parent abba6cece5
commit e7aaf24f12
3 changed files with 3 additions and 62 deletions

19
README
View file

@ -1,19 +0,0 @@
Fully automated webservices installer
* Mail server
* Web syndication
* Instant messaging
* Calendar & contact synchonization
* And More
Open source components
* Debian
* Postfix
* Dovecot
* OpenLDAP
* Apache2
* Ejabberd
* LemonLDAP-NG
How-to build
http://wiki.yunohost.org/BuildCD

View file

@ -27,7 +27,6 @@
#
set -x
BUILd_DIR=$(pwd)
is_iso() {
file "$1" | grep -q "ISO 9660"
@ -58,6 +57,7 @@ initrd_append_fw() {
local initrd="$1"
local fwfile="$2"
local outfile="$3"
local BUILD_DIR=$(pwd)
local initrdtmp="$(mktemp -d)"
gunzip < "$initrd" > "$initrdtmp/initrd"
@ -113,6 +113,7 @@ if is_iso "$file"; then
isotmp="$(mktemp -d)"
tmpmnt="$isotmp/tmpmnt"
buildtree="$isotmp/buildtree"
BUILD_DIR=$(pwd)
mkdir "$tmpmnt"
if am_root; then
@ -149,7 +150,7 @@ if is_iso "$file"; then
done
isolinuxpath="$(cd $buildtree && find . -name isolinux.bin | head -1 | cut -b 3-)"
mkisofs -r -J -b "$isolinuxpath" -c boot.cat \
genisoimage -r -J -b "$isolinuxpath" -c boot.cat \
-no-emul-boot -boot-load-size 4 -boot-info-table \
-o "$outfile" "$buildtree"
rm -rf "$isotmp"

View file

@ -1,41 +0,0 @@
#!/bin/bash
BUILD2="/home/yunohost/yunohostv2-amd64"
BUILD="/home/yunohost/yunohostv2-i386"
DATE=$(date +%m%d%y%H%M)
function build-i386
{
cd $BUILD
build-simple-cdd --dist wheezy --force-preseed --conf ./simple-cdd-i386.conf
add-firmware-to images/debian-6.0.7-i386-CD-1.iso images/yunohostv2-$DATE-i386.iso wheezy
rm images/debian-6.0.7-i386-CD-1.iso
rm /var/www/build.yunohost.org/images/yunohostv2-latest-i386.iso
ln -s $BUILD/images/yunohostv2-$DATE-i386.iso /var/www/build.yunohost.org/images/yunohostv2-latest-i386.iso
}
function build-amd64
{
cd $BUILD2
build-simple-cdd --dist wheezy --force-preseed --conf ./simple-cdd-amd64.conf
add-firmware-to images/debian-7.1.0-amd64-CD-1.iso images/yunohostv2-$DATE-amd64.iso wheezy
#rm images/debian-6.0.7-amd64-CD-1.iso
#rm /var/www/build.yunohost.org/images/yunohostv2-latest-amd64.iso
ln -s $BUILD2/images/yunohostv2-$DATE-amd64.iso /var/www/build.yunohost.org/images/yunohostv2-latest-amd64.iso
}
if [[ "${1:-1}" = 1 ]]
then
build-i386
build-amd64
else
case $1 in
i386)
build-i386
;;
amd64)
build-amd64
;;
esac
fi