diff --git a/README.md b/README.md index 710cce5..519f280 100644 --- a/README.md +++ b/README.md @@ -6,15 +6,15 @@ Requirements ------------ * Debian Wheezy -* genisoimage +* A sudoer Installation ------------ ``` wget http://build.yunohost.org/simple-cdd_0.3.14_all.deb -dpkg -i simple-cdd_0.3.14_all.deb -apt-get install -f +sudo dpkg -i simple-cdd_0.3.14_all.deb +sudo apt-get install -f genisoimage git clone git://github.com/YunoHost/cd_build.git ``` @@ -23,7 +23,6 @@ Some problems can occur at `dpkg -i` but keep going ! Usage ----- - ``` cd cd_build ./build-yunohost amd64 @@ -34,3 +33,12 @@ Or ``` ./build-yunohost i386 ``` + + +Troubleshooting +--------------- + +If you got errors for mysql-password debconf, temporaly change rights on /var/cache/debconf/passwords.dat +``` +sudo chmod 666 /var/cache/debconf/passwords.dat +``` diff --git a/build-yunohost b/build-yunohost index 1f874c5..81527d3 100755 --- a/build-yunohost +++ b/build-yunohost @@ -8,18 +8,25 @@ 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 +add-firmware-to images/debian-7.0-i386-CD-1.iso images/yunohostv2-$DATE-i386.iso wheezy +rm images/debian-7.0-i386-CD-1.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 +add-firmware-to images/debian-7.0-amd64-CD-1.iso images/yunohostv2-$DATE-amd64.iso wheezy +rm images/debian-7.0-amd64-CD-1.iso } +function build-amd64-test +{ +cd $BUILD2 +build-simple-cdd --dist wheezy --force-preseed --conf ./simple-cdd-amd64-test.conf +add-firmware-to images/debian-7.0-amd64-CD-1.iso images/yunohostv2-$DATE-amd64-test.iso wheezy +rm images/debian-7.0-amd64-CD-1.iso +} if [[ "${1:-1}" = 1 ]] then @@ -33,5 +40,8 @@ else amd64) build-amd64 ;; + test) + build-amd64-test + ;; esac fi diff --git a/profiles/test.preseed b/profiles/test.preseed new file mode 100644 index 0000000..dcd903d --- /dev/null +++ b/profiles/test.preseed @@ -0,0 +1,3 @@ +d-i apt-setup/local2/repository string \ + http://repo.yunohost.org/ test main +d-i apt-setup/local2/key string http://repo.yunohost.org/yunohost.asc diff --git a/simple-cdd-multi.conf b/simple-cdd-amd64-test.conf similarity index 76% rename from simple-cdd-multi.conf rename to simple-cdd-amd64-test.conf index 4edcbd0..680d3a8 100644 --- a/simple-cdd-multi.conf +++ b/simple-cdd-amd64-test.conf @@ -1,13 +1,12 @@ server="ftp.fr.debian.org" debian_mirror="ftp://$server/debian/" rsync_debian_mirror="$server::debian" -profiles="default" +profiles="default test advanced" mirror_components="main contrib non-free" -export ARCH="i386 amd64" +export ARCH="amd64" export DISKINFO="YunoHost $(date --utc +%Y%m%d)" export OMIT_MANUAL=1 export OMIT_RELEASE_NOTES=1 export INSTALLER_CD=2 export DOJIGDO=0 -all_extras="`pwd`/extras/.vimrc `pwd`/extras/.bashrc" export SPLASHPNG="`pwd`/extras/splash.png" diff --git a/simple-cdd-amd64.conf b/simple-cdd-amd64.conf index bb3d2f8..e65732c 100644 --- a/simple-cdd-amd64.conf +++ b/simple-cdd-amd64.conf @@ -9,5 +9,4 @@ export OMIT_MANUAL=1 export OMIT_RELEASE_NOTES=1 export INSTALLER_CD=2 export DOJIGDO=0 -all_extras="`pwd`/extras/.vimrc `pwd`/extras/.bashrc" export SPLASHPNG="`pwd`/extras/splash.png" diff --git a/simple-cdd-i386.conf b/simple-cdd-i386.conf index 8dbe38e..a73d070 100644 --- a/simple-cdd-i386.conf +++ b/simple-cdd-i386.conf @@ -9,5 +9,4 @@ export OMIT_MANUAL=1 export OMIT_RELEASE_NOTES=1 export INSTALLER_CD=2 export DOJIGDO=0 -all_extras="`pwd`/extras/.vimrc `pwd`/extras/.bashrc" export SPLASHPNG="`pwd`/extras/splash.png"