From: Enlightenment S. <no-...@en...> - 2009-05-08 12:55:25
|
Log: Changed pbuilderrc name - more visible and changed README according to that Author: quaker Date: 2009-05-08 05:55:23 -0700 (Fri, 08 May 2009) New Revision: 40552 Added: trunk/packaging/debian/pbuilder-config Removed: trunk/packaging/debian/.pbuilderrc Modified: trunk/packaging/debian/README Deleted: trunk/packaging/debian/.pbuilderrc Modified: trunk/packaging/debian/README =================================================================== --- trunk/packaging/debian/README 2009-05-08 12:49:25 UTC (rev 40551) +++ trunk/packaging/debian/README 2009-05-08 12:55:23 UTC (rev 40552) @@ -1,5 +1,5 @@ ## E17 builder script for Debian, Ubuntu and its derivatives ## -1. Copy .pbuilderrc to your home folder +1. Copy pbuilder-config to your home folder UNDER NAME .pbuilderrc 2. Copy the script wherever you want 3. Run a terminal and cd to that dir 4. Run the script with --help and you will see possible parameters and their order(download, makechroots, compile, upload) Copied: trunk/packaging/debian/pbuilder-config (from rev 40551, trunk/packaging/debian/.pbuilderrc) Property changes on: trunk/packaging/debian/pbuilder-config ___________________________________________________________________ Name: svn:mergeinfo + |
From: Enlightenment S. <no-...@en...> - 2009-05-09 16:41:10
|
Log: Updated debian build script. Author: quaker Date: 2009-05-09 09:40:59 -0700 (Sat, 09 May 2009) New Revision: 40571 Modified: trunk/packaging/debian/README trunk/packaging/debian/e17builder.sh Modified: trunk/packaging/debian/README =================================================================== --- trunk/packaging/debian/README 2009-05-09 16:18:31 UTC (rev 40570) +++ trunk/packaging/debian/README 2009-05-09 16:40:59 UTC (rev 40571) @@ -1,7 +1,8 @@ ## E17 builder script for Debian, Ubuntu and its derivatives ## 1. Copy pbuilder-config to your home folder UNDER NAME .pbuilderrc 2. Copy the script wherever you want -3. Run a terminal and cd to that dir -4. Run the script with --help and you will see possible parameters and their order(download, makechroots, compile, upload) +3. Open the script in the text editor and modify variables in the beginning as you want(like compile list, distro list, svn username..) +4. Run a terminal and cd to that dir +5. Run the script with --help and you will see possible parameters and their order(download, makechroots, setup, compile, upload) quaker66 (trunk/devs/quaker) Modified: trunk/packaging/debian/e17builder.sh =================================================================== --- trunk/packaging/debian/e17builder.sh 2009-05-09 16:18:31 UTC (rev 40570) +++ trunk/packaging/debian/e17builder.sh 2009-05-09 16:40:59 UTC (rev 40571) @@ -11,12 +11,23 @@ # user variables :) +# here enter your esvn username. username="USERNAME" +# url of packages, it shouldn't change eurl="http://packages.enlightenment.org" +# enlightenment server to connect eserver="e2.enlightenment.org" +# current source version currentversion=$(wget -O- $eurl/CURRENTVERSION) +# path of sources on the server path="/var/www/packages/debian/pool/source/sources-$currentversion" +# path of md5sum file on the server +md5path="$eurl/SOURCES-MD5" +# local folder for binaries and sources localpath="$HOME/repository_folder" +# this is where chroot(packed/unpacked) and final result before tree preparation will be, change if you haven't got much space in /var +pbuilderplace="/var/cache/pbuilder" +# distro list distros=( ## ubuntu # hardy - x86* @@ -51,7 +62,7 @@ "squeeze#armel" "sid#armel" ) - +# list of things to compile, comment out things which you don't want to compile, or which are not made for your distro compile_list=( # going to release "eina" @@ -74,7 +85,6 @@ "exchange" "elementary" # extra apps -"entrance" "ecomp" "ecomorph-e17" "emprint" @@ -122,6 +132,33 @@ mv sources-$currentversion/main/* . mv sources-$currentversion/extras/* . rm -r sources-$currentversion +echo "DOWNLOADING MD5SUMS..." +wget $md5path +echo "CHECKING MD5SUMS..." +for md5 in $(find . -name '*.*[.dsc,.tar.gz]'); do + if [ "$(md5sum $md5 | sed 's/ .*//')" = "$(cat SOURCES-MD5 | grep "$(echo $md5 | sed 's/.\///')" | sed 's/ .*//')" ]; then + echo "$md5: MD5 OK" + else + badchecksums="1" + echo "$md5: MD5 bad, downloading again." + while badchecksums="1"; do + rm $md5 + if test $(echo $md5 | egrep "(eina|eet|evas|ecore|embryo|edje|edbus|efreet|e17)"); then + scp -r $username@$eserver:$path/main/$(echo $md5 | sed 's/.\///') $md5 + else + scp -r $username@$eserver:$path/extras/$(echo $md5 | sed 's/.\///') $md5 + fi + if [ "$(md5sum $md5 | sed 's/ .*//')" = "$(cat SOURCES-MD5 | grep "$(echo $md5 | sed 's/.\///')" | sed 's/ .*//')" ]; then + echo "MD5 OK now." + badchecksums="0" + else + echo "MD5 bad again. How this is possible?" + fi + done + fi +done +rm SOURCES-MD5 +echo "DONE DOWNLOADING..." } makechroots() { @@ -131,7 +168,7 @@ echo "CREATING CHROOTS..." for chroots in ${distros[@]}; do echo "Creating chroot: $(echo $chroots | sed 's/#.*//'):$(echo $chroots | sed 's/.*#//')" - sudo DIST=$(echo $chroots | sed 's/#.*//') ARCH=$(echo $chroots | sed 's/.*#//') pbuilder create + sudo DIST=$(echo $chroots | sed 's/#.*//') ARCH=$(echo $chroots | sed 's/.*#//') pbuilder create --basetgz $pbuilderplace/$(echo $chroots | sed 's/#.*//')-$(echo $chroots | sed 's/.*#//')-base.tgz if [ "$?" -ge "1" ]; then echo "ERROR, exitting." exit 1 @@ -142,16 +179,40 @@ sed -i 's/#OTHERMIRROR=/OTHERMIRROR=/g' $HOME/.pbuilderrc } +setup() { +echo "INSTALLING PBUILDER..." +sudo apt-get --assume-yes --force-yes install pbuilder debootstrap devscripts +echo "INSTALLING UBUNTU KEYRING..." +if [ -z "$(dpkg -l | grep ii | grep ubuntu-keyring)" ]; then + wget http://archive.ubuntu.com/ubuntu/pool/main/u/ubuntu-keyring/ubuntu-keyring_2008.03.04_all.deb + sudo dpkg -i ubuntu-keyring_2008.03.04_all.deb + if [ "$?" = "0" ]; then + echo "Installed ubuntu keyring. Removing deb package." + rm ubuntu-keyring_2008.03.04_all.deb + else + echo "error while installing, exitting." + exit 1 + fi +fi +echo "CREATING LOCAL FOLDER..." +if [ -d $localpath ]; then + echo "WARNING: local folder already exists, if it is created by script, it's OK but if not, it may cause problems." + read +else + mkdir -p $localpath +fi +} + compile() { for distrocomp in ${distros[@]}; do echo "Unpacking chroot $(echo $distrocomp | sed 's/#.*//'):$(echo $distrocomp | sed 's/.*#//')" - if [ -d "/var/cache/pbuilder/build/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//')" ]; then + if [ -d "$pbuilderplace/build/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//')" ]; then echo "Directory to unpack already exists. Remove or move it first, exitting." exit 1 fi - sudo mkdir /var/cache/pbuilder/build/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//') - sudo mkdir -p /var/cache/pbuilder/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//')/result - sudo tar -C /var/cache/pbuilder/build/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//') -xf /var/cache/pbuilder/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//')-base.tgz + sudo mkdir $pbuilderplace/build/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//') + sudo mkdir -p $pbuilderplace/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//')/result + sudo tar -C $pbuilderplace/build/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//') -xf $pbuilderplace/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//')-base.tgz if [ "$?" -ge "1" ]; then echo "ERROR, exitting." exit 1 @@ -159,38 +220,41 @@ basedir=$(pwd) echo "Compiling for: $(echo $distrocomp | sed 's/#.*//'):$(echo $distrocomp | sed 's/.*#//')" for comp in ${compile_list[@]}; do - pbuildpath="/var/cache/pbuilder/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//')" + pbuildpath="$pbuilderplace/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//')" cd $comp echo "Compiling: $comp" - sudo DIST="$(echo $distrocomp | sed 's/#.*//')" ARCH="$(echo $distrocomp | sed 's/.*#//')" pbuilder build --buildplace /var/cache/pbuilder/build/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//') --no-targz *.dsc + sudo DIST="$(echo $distrocomp | sed 's/#.*//')" ARCH="$(echo $distrocomp | sed 's/.*#//')" pbuilder build --buildresult $pbuilderplace/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//')/result --buildplace $pbuilderplace/build/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//') --no-targz *.dsc if [ "$?" -ge "1" ]; then echo "ERROR, exitting." exit 1 fi cd .. - sudo rm -rf /var/cache/pbuilder/build/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//')/tmp/buildd/* - sudo rm -rf /var/cache/pbuilder/build/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//')/tmp/satisfydepends* + sudo rm -rf $pbuilderplace/build/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//')/tmp/buildd/* + sudo rm -rf $pbuilderplace/build/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//')/tmp/satisfydepends* sudo mkdir -p $pbuildpath/result/binaries/$comp sudo mv $pbuildpath/result/*.deb $pbuildpath/result/binaries/$comp echo "Rebuilding packages database." cd $pbuildpath/result sudo dpkg-scanpackages . /dev/null | sudo tee Packages cd $basedir - sudo DIST="$(echo $distrocomp | sed 's/#.*//')" ARCH="$(echo $distrocomp | sed 's/.*#//')" pbuilder update --override-config --buildplace /var/cache/pbuilder/build/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//') --no-targz + sudo DIST="$(echo $distrocomp | sed 's/#.*//')" ARCH="$(echo $distrocomp | sed 's/.*#//')" pbuilder update --override-config --buildplace $pbuilderplace/build/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//') --no-targz if [ "$?" -ge "1" ]; then echo "ERROR, exitting." exit 1 fi done echo "Updating base tarball for $(echo $distrocomp | sed 's/#.*//'):$(echo $distrocomp | sed 's/.*#//') again after compilation.." - sudo DIST="$(echo $distrocomp | sed 's/#.*//')" ARCH="$(echo $distrocomp | sed 's/.*#//')" pbuilder update --override-config - sudo rm -rf /var/cache/pbuilder/build/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//') + sudo DIST="$(echo $distrocomp | sed 's/#.*//')" ARCH="$(echo $distrocomp | sed 's/.*#//')" pbuilder update --override-config --basetgz $pbuilderplace/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//')-base.tgz + sudo rm -rf $pbuilderplace/build/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//') + sudo rm -rf $pbuilderplace/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//')/result/*.tar.gz + sudo rm -rf $pbuilderplace/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//')/result/*.dsc + sudo rm -rf $pbuilderplace/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//')/result/*.changes done } prepare() { for preparelist in ${distros[@]}; do - preparepath="/var/cache/pbuilder/$(echo $preparelist | sed 's/#.*//')-$(echo $preparelist | sed 's/.*#//')/result/binaries" + preparepath="$pbuilderplace/$(echo $preparelist | sed 's/#.*//')-$(echo $preparelist | sed 's/.*#//')/result/binaries" case $(echo $preparelist | sed 's/#.*//') in hardy|intrepid|jaunty) distro=ubuntu ;; @@ -198,6 +262,11 @@ ;; esac # prepare pool tree and make dirs of dists + echo "Checking.." + if [ -d "$distro" ]; then + echo "Folder already exists, moving." + mv $distro "$distro-bk$(date +%Y%m%d)" + fi echo "Creating dirs.." if [ ! -d "$distro/dists/$(echo $preparelist | sed 's/#.*//')/main/binary-$(echo $preparelist | sed 's/.*#//')" ]; then mkdir -p $distro/dists/$(echo $preparelist | sed 's/#.*//')/main/binary-$(echo $preparelist | sed 's/.*#//') @@ -253,6 +322,7 @@ --download - download things --makechroots - make chroots +--setup - configure host system for build --compile - compile stuff --prepare - make tree --upload - upload things @@ -264,7 +334,7 @@ # check for deps -for deps in sudo scp dpkg-scanpackages gzip; do +for deps in sudo scp dpkg-scanpackages gzip /usr/sbin/pbuilder; do which $deps if [ "$?" -ge "1" ]; then echo "Missing dep: $deps" @@ -272,34 +342,19 @@ fi done -sudo apt-get install pbuilder debootstrap devscripts - -if [ -z "$(dpkg -l | grep ii | grep ubuntu-keyring)" ]; then - wget http://archive.ubuntu.com/ubuntu/pool/main/u/ubuntu-keyring/ubuntu-keyring_2008.03.04_all.deb - sudo dpkg -i ubuntu-keyring_2008.03.04_all.deb - if [ "$?" = "0" ]; then - echo "Installed ubuntu keyring. Removing deb package." - rm ubuntu-keyring_2008.03.04_all.deb - else - echo "error while installing, exitting." - exit 1 - fi +cd $localpath +if [ "$?" -ge "1" ]; then + echo "Failed to change directory to $localpath. It looks that folder does not exist, run script with --setup." + exit 1 fi -if [ -d $localpath ]; then - echo "WARNING: local folder already exists, if it is created by script, it's OK but if not, it may cause problems." - read -else - mkdir -p $localpath -fi - -cd $localpath - case $1 in --download) download ;; --makechroots) makechroots ;; + --setup) setup + ;; --compile) compile ;; --prepare) prepare @@ -308,6 +363,10 @@ ;; --help) print_help ;; + *) + echo "No or bad argument, run it with --help to see what it can do." + exit 1 + ;; esac exit 0 |
From: Enlightenment S. <no-...@en...> - 2009-05-09 16:56:04
|
Log: fixed script. Author: quaker Date: 2009-05-09 09:55:54 -0700 (Sat, 09 May 2009) New Revision: 40572 Modified: trunk/packaging/debian/e17builder.sh Modified: trunk/packaging/debian/e17builder.sh =================================================================== --- trunk/packaging/debian/e17builder.sh 2009-05-09 16:40:59 UTC (rev 40571) +++ trunk/packaging/debian/e17builder.sh 2009-05-09 16:55:54 UTC (rev 40572) @@ -196,8 +196,8 @@ fi echo "CREATING LOCAL FOLDER..." if [ -d $localpath ]; then - echo "WARNING: local folder already exists, if it is created by script, it's OK but if not, it may cause problems." - read + echo "WARNING: local folder already exists, delete it or move it or something." + exit 1 else mkdir -p $localpath fi |
From: Enlightenment S. <no-...@en...> - 2009-05-10 08:22:13
|
Log: Updated build script for debian. Author: quaker Date: 2009-05-10 01:22:06 -0700 (Sun, 10 May 2009) New Revision: 40574 Modified: trunk/packaging/debian/e17builder.sh Modified: trunk/packaging/debian/e17builder.sh =================================================================== --- trunk/packaging/debian/e17builder.sh 2009-05-10 03:06:49 UTC (rev 40573) +++ trunk/packaging/debian/e17builder.sh 2009-05-10 08:22:06 UTC (rev 40574) @@ -62,6 +62,19 @@ "squeeze#armel" "sid#armel" ) + +# list of distros to build database for. +dtb=( +## ubuntu +"hardy" +"intrepid" +"jaunty" +## debian +"lenny" +"squeeze" +"sid" +) + # list of things to compile, comment out things which you don't want to compile, or which are not made for your distro compile_list=( # going to release @@ -262,11 +275,6 @@ ;; esac # prepare pool tree and make dirs of dists - echo "Checking.." - if [ -d "$distro" ]; then - echo "Folder already exists, moving." - mv $distro "$distro-bk$(date +%Y%m%d)" - fi echo "Creating dirs.." if [ ! -d "$distro/dists/$(echo $preparelist | sed 's/#.*//')/main/binary-$(echo $preparelist | sed 's/.*#//')" ]; then mkdir -p $distro/dists/$(echo $preparelist | sed 's/#.*//')/main/binary-$(echo $preparelist | sed 's/.*#//') @@ -284,9 +292,21 @@ cp -rf $preparepath/* $distro/pool/$(echo $preparelist | sed 's/#.*//')/binaries-$currentversion/extras cp -rf $distro/pool/$(echo $preparelist | sed 's/#.*//')/binaries-$currentversion/extras/{eina,eet,evas,ecore,embryo,edje,e_dbus,efreet,e} $distro/pool/$(echo $preparelist | sed 's/#.*//')/binaries-$currentversion/main rm -rf $distro/pool/$(echo $preparelist | sed 's/#.*//')/binaries-$currentversion/extras/{eina,eet,evas,ecore,embryo,edje,e_dbus,efreet,e} + echo "Done. If you have binaries for all architectures in the right place, run script with --database. Don't make databases if you have only one arch in the folder, because there are also some files with architecture all, they will be rewritten when you will compile another arch and they will have different checksums." +done +} + +database() { +for databases in ${dtb[@]}; do + case $databases in + hardy|intrepid|jaunty) distr=ubuntu + ;; + *) distr=debian + ;; + esac echo "Making databases." # make database for main section - cd $distro + cd $disto dpkg-scanpackages --arch $(echo $preparelist | sed 's/.*#//') pool/$(echo $preparelist | sed 's/#.*//')/binaries-$currentversion/main /dev/null | tee Packages cp Packages Pkgs gzip -f Packages @@ -300,7 +320,6 @@ mv {Packages,Packages.gz} dists/$(echo $preparelist | sed 's/#.*//')/extras/binary-$(echo $preparelist | sed 's/.*#//') echo "Done." cd .. -done } upload() { |
From: Enlightenment S. <no-...@en...> - 2009-05-10 08:24:06
|
Log: oops, forgot to add parameter. Author: quaker Date: 2009-05-10 01:24:01 -0700 (Sun, 10 May 2009) New Revision: 40575 Modified: trunk/packaging/debian/e17builder.sh Modified: trunk/packaging/debian/e17builder.sh =================================================================== --- trunk/packaging/debian/e17builder.sh 2009-05-10 08:22:06 UTC (rev 40574) +++ trunk/packaging/debian/e17builder.sh 2009-05-10 08:24:01 UTC (rev 40575) @@ -344,6 +344,7 @@ --setup - configure host system for build --compile - compile stuff --prepare - make tree +--database - make databases --upload - upload things --help - show this EOF @@ -378,6 +379,8 @@ ;; --prepare) prepare ;; + --database) database + ;; --upload) upload ;; --help) print_help |
From: Enlightenment S. <no-...@en...> - 2009-05-10 08:26:19
|
Log: fixed a bug Author: quaker Date: 2009-05-10 01:26:12 -0700 (Sun, 10 May 2009) New Revision: 40576 Modified: trunk/packaging/debian/e17builder.sh Modified: trunk/packaging/debian/e17builder.sh =================================================================== --- trunk/packaging/debian/e17builder.sh 2009-05-10 08:24:01 UTC (rev 40575) +++ trunk/packaging/debian/e17builder.sh 2009-05-10 08:26:12 UTC (rev 40576) @@ -320,6 +320,7 @@ mv {Packages,Packages.gz} dists/$(echo $preparelist | sed 's/#.*//')/extras/binary-$(echo $preparelist | sed 's/.*#//') echo "Done." cd .. +done } upload() { |
From: Enlightenment S. <no-...@en...> - 2009-05-10 08:30:50
|
Log: Added custom suites file. Author: quaker Date: 2009-05-10 01:30:47 -0700 (Sun, 10 May 2009) New Revision: 40577 Added: trunk/packaging/debian/suites Modified: trunk/packaging/debian/README Modified: trunk/packaging/debian/README =================================================================== --- trunk/packaging/debian/README 2009-05-10 08:26:12 UTC (rev 40576) +++ trunk/packaging/debian/README 2009-05-10 08:30:47 UTC (rev 40577) @@ -5,4 +5,6 @@ 4. Run a terminal and cd to that dir 5. Run the script with --help and you will see possible parameters and their order(download, makechroots, setup, compile, upload) +# if you compile for debian squeeze, replace /usr/share/cdbootstrap/suites with suites file here. + quaker66 (trunk/devs/quaker) Added: trunk/packaging/debian/suites |
From: Enlightenment S. <no-...@en...> - 2009-05-10 09:39:35
|
Log: Fixed script. Author: quaker Date: 2009-05-10 02:39:29 -0700 (Sun, 10 May 2009) New Revision: 40579 Modified: trunk/packaging/debian/e17builder.sh Modified: trunk/packaging/debian/e17builder.sh =================================================================== --- trunk/packaging/debian/e17builder.sh 2009-05-10 09:31:01 UTC (rev 40578) +++ trunk/packaging/debian/e17builder.sh 2009-05-10 09:39:29 UTC (rev 40579) @@ -363,6 +363,11 @@ fi done +case $1 in + --setup) setup + ;; +esac + cd $localpath if [ "$?" -ge "1" ]; then echo "Failed to change directory to $localpath. It looks that folder does not exist, run script with --setup." @@ -374,8 +379,6 @@ ;; --makechroots) makechroots ;; - --setup) setup - ;; --compile) compile ;; --prepare) prepare @@ -386,10 +389,10 @@ ;; --help) print_help ;; + --setup) "" + ;; *) echo "No or bad argument, run it with --help to see what it can do." exit 1 ;; esac - -exit 0 |
From: Enlightenment S. <no-...@en...> - 2009-05-10 09:40:29
|
Log: Change order of commands. Author: quaker Date: 2009-05-10 02:40:22 -0700 (Sun, 10 May 2009) New Revision: 40580 Modified: trunk/packaging/debian/README trunk/packaging/debian/e17builder.sh Modified: trunk/packaging/debian/README =================================================================== --- trunk/packaging/debian/README 2009-05-10 09:39:29 UTC (rev 40579) +++ trunk/packaging/debian/README 2009-05-10 09:40:22 UTC (rev 40580) @@ -3,7 +3,7 @@ 2. Copy the script wherever you want 3. Open the script in the text editor and modify variables in the beginning as you want(like compile list, distro list, svn username..) 4. Run a terminal and cd to that dir -5. Run the script with --help and you will see possible parameters and their order(download, makechroots, setup, compile, upload) +5. Run the script with --help and you will see possible parameters and their order(setup, download, makechroots, compile, upload) # if you compile for debian squeeze, replace /usr/share/cdbootstrap/suites with suites file here. Modified: trunk/packaging/debian/e17builder.sh =================================================================== --- trunk/packaging/debian/e17builder.sh 2009-05-10 09:39:29 UTC (rev 40579) +++ trunk/packaging/debian/e17builder.sh 2009-05-10 09:40:22 UTC (rev 40580) @@ -340,9 +340,9 @@ cat << EOF parameters: +--setup - configure host system for build --download - download things --makechroots - make chroots ---setup - configure host system for build --compile - compile stuff --prepare - make tree --database - make databases |
From: Enlightenment S. <no-...@en...> - 2009-05-10 11:14:19
|
Log: Fixed debian build script. Author: quaker Date: 2009-05-10 04:14:07 -0700 (Sun, 10 May 2009) New Revision: 40581 Modified: trunk/packaging/debian/e17builder.sh Modified: trunk/packaging/debian/e17builder.sh =================================================================== --- trunk/packaging/debian/e17builder.sh 2009-05-10 09:40:22 UTC (rev 40580) +++ trunk/packaging/debian/e17builder.sh 2009-05-10 11:14:07 UTC (rev 40581) @@ -140,11 +140,6 @@ # functions download() { -echo "DOWNLOADING PACKAGES WITH SCP..." -scp -r $username@$eserver:$path ./ -mv sources-$currentversion/main/* . -mv sources-$currentversion/extras/* . -rm -r sources-$currentversion echo "DOWNLOADING MD5SUMS..." wget $md5path echo "CHECKING MD5SUMS..." @@ -389,10 +384,12 @@ ;; --help) print_help ;; - --setup) "" + --setup) exit 0 ;; *) echo "No or bad argument, run it with --help to see what it can do." exit 1 ;; esac + +exit 0 |
From: Enlightenment S. <no-...@en...> - 2009-05-10 12:21:28
|
Log: Now downloads only things in compile_list, and also fixed creation of chroot with another pbuilderplace. Author: quaker Date: 2009-05-10 05:21:00 -0700 (Sun, 10 May 2009) New Revision: 40582 Modified: trunk/packaging/debian/e17builder.sh Modified: trunk/packaging/debian/e17builder.sh =================================================================== --- trunk/packaging/debian/e17builder.sh 2009-05-10 11:14:07 UTC (rev 40581) +++ trunk/packaging/debian/e17builder.sh 2009-05-10 12:21:00 UTC (rev 40582) @@ -140,6 +140,15 @@ # functions download() { +echo "DOWNLOADING PACKAGES WITH SCP..." +for down in ${compile_list[@]}; do + case $down in + eina|eet|evas|ecore|embryo|edje|edbus|efreet|e17) scp -r $username@$eserver:$path/main/$down ./ + ;; + *) scp -r $username@$eserver:$path/extras/$down ./ + ;; + esac +done echo "DOWNLOADING MD5SUMS..." wget $md5path echo "CHECKING MD5SUMS..." @@ -176,7 +185,7 @@ echo "CREATING CHROOTS..." for chroots in ${distros[@]}; do echo "Creating chroot: $(echo $chroots | sed 's/#.*//'):$(echo $chroots | sed 's/.*#//')" - sudo DIST=$(echo $chroots | sed 's/#.*//') ARCH=$(echo $chroots | sed 's/.*#//') pbuilder create --basetgz $pbuilderplace/$(echo $chroots | sed 's/#.*//')-$(echo $chroots | sed 's/.*#//')-base.tgz + sudo DIST=$(echo $chroots | sed 's/#.*//') ARCH=$(echo $chroots | sed 's/.*#//') pbuilder create --basetgz $pbuilderplace/$(echo $chroots | sed 's/#.*//')-$(echo $chroots | sed 's/.*#//')-base.tgz --buildplace $pbuilderplace/build/$(echo $chroots | sed 's/#.*//')-$(echo $chroots | sed 's/.*#//') if [ "$?" -ge "1" ]; then echo "ERROR, exitting." exit 1 @@ -209,6 +218,10 @@ else mkdir -p $localpath fi +echo "CREATING $pbuilderplace IF NOT EXISTS..." +if [ ! -d "$pbuilderplace" ]; then + sudo mkdir $pbuilderplace +fi } compile() { |
From: Enlightenment S. <no-...@en...> - 2009-05-11 14:46:46
|
Log: Updated script. Pbuilderrc now changes /var/cache/pbuilder when it is changed in script. Author: quaker Date: 2009-05-11 07:46:38 -0700 (Mon, 11 May 2009) New Revision: 40590 Modified: trunk/packaging/debian/README trunk/packaging/debian/e17builder.sh trunk/packaging/debian/pbuilder-config Modified: trunk/packaging/debian/README =================================================================== --- trunk/packaging/debian/README 2009-05-11 13:10:38 UTC (rev 40589) +++ trunk/packaging/debian/README 2009-05-11 14:46:38 UTC (rev 40590) @@ -3,7 +3,7 @@ 2. Copy the script wherever you want 3. Open the script in the text editor and modify variables in the beginning as you want(like compile list, distro list, svn username..) 4. Run a terminal and cd to that dir -5. Run the script with --help and you will see possible parameters and their order(setup, download, makechroots, compile, upload) +5. Run the script with --help and you will see possible parameters and their order(setup, download, makechroots, compile, prepare, database, upload) # if you compile for debian squeeze, replace /usr/share/cdbootstrap/suites with suites file here. Modified: trunk/packaging/debian/e17builder.sh =================================================================== --- trunk/packaging/debian/e17builder.sh 2009-05-11 13:10:38 UTC (rev 40589) +++ trunk/packaging/debian/e17builder.sh 2009-05-11 14:46:38 UTC (rev 40590) @@ -185,7 +185,7 @@ echo "CREATING CHROOTS..." for chroots in ${distros[@]}; do echo "Creating chroot: $(echo $chroots | sed 's/#.*//'):$(echo $chroots | sed 's/.*#//')" - sudo DIST=$(echo $chroots | sed 's/#.*//') ARCH=$(echo $chroots | sed 's/.*#//') pbuilder create --basetgz $pbuilderplace/$(echo $chroots | sed 's/#.*//')-$(echo $chroots | sed 's/.*#//')-base.tgz --buildplace $pbuilderplace/build/$(echo $chroots | sed 's/#.*//')-$(echo $chroots | sed 's/.*#//') + sudo DIST=$(echo $chroots | sed 's/#.*//') ARCH=$(echo $chroots | sed 's/.*#//') PBUILDERPLACE="$pbuilderplace" pbuilder create --basetgz $pbuilderplace/$(echo $chroots | sed 's/#.*//')-$(echo $chroots | sed 's/.*#//')-base.tgz --buildplace $pbuilderplace/build/$(echo $chroots | sed 's/#.*//')-$(echo $chroots | sed 's/.*#//') if [ "$?" -ge "1" ]; then echo "ERROR, exitting." exit 1 @@ -198,7 +198,7 @@ setup() { echo "INSTALLING PBUILDER..." -sudo apt-get --assume-yes --force-yes install pbuilder debootstrap devscripts +sudo apt-get --assume-yes --force-yes install pbuilder debootstrap devscripts ccache echo "INSTALLING UBUNTU KEYRING..." if [ -z "$(dpkg -l | grep ii | grep ubuntu-keyring)" ]; then wget http://archive.ubuntu.com/ubuntu/pool/main/u/ubuntu-keyring/ubuntu-keyring_2008.03.04_all.deb @@ -244,7 +244,7 @@ pbuildpath="$pbuilderplace/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//')" cd $comp echo "Compiling: $comp" - sudo DIST="$(echo $distrocomp | sed 's/#.*//')" ARCH="$(echo $distrocomp | sed 's/.*#//')" pbuilder build --buildresult $pbuilderplace/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//')/result --buildplace $pbuilderplace/build/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//') --no-targz *.dsc + sudo DIST="$(echo $distrocomp | sed 's/#.*//')" ARCH="$(echo $distrocomp | sed 's/.*#//')" PBUILDERPLACE="$pbuilderplace" pbuilder build --buildresult $pbuilderplace/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//')/result --buildplace $pbuilderplace/build/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//') --no-targz *.dsc if [ "$?" -ge "1" ]; then echo "ERROR, exitting." exit 1 @@ -258,14 +258,14 @@ cd $pbuildpath/result sudo dpkg-scanpackages . /dev/null | sudo tee Packages cd $basedir - sudo DIST="$(echo $distrocomp | sed 's/#.*//')" ARCH="$(echo $distrocomp | sed 's/.*#//')" pbuilder update --override-config --buildplace $pbuilderplace/build/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//') --no-targz + sudo DIST="$(echo $distrocomp | sed 's/#.*//')" ARCH="$(echo $distrocomp | sed 's/.*#//')" PBUILDERPLACE="$pbuilderplace" pbuilder update --override-config --buildplace $pbuilderplace/build/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//') --no-targz if [ "$?" -ge "1" ]; then echo "ERROR, exitting." exit 1 fi done echo "Updating base tarball for $(echo $distrocomp | sed 's/#.*//'):$(echo $distrocomp | sed 's/.*#//') again after compilation.." - sudo DIST="$(echo $distrocomp | sed 's/#.*//')" ARCH="$(echo $distrocomp | sed 's/.*#//')" pbuilder update --override-config --basetgz $pbuilderplace/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//')-base.tgz + sudo DIST="$(echo $distrocomp | sed 's/#.*//')" ARCH="$(echo $distrocomp | sed 's/.*#//')" PBUILDERPLACE="$pbuilderplace" pbuilder update --override-config --basetgz $pbuilderplace/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//')-base.tgz sudo rm -rf $pbuilderplace/build/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//') sudo rm -rf $pbuilderplace/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//')/result/*.tar.gz sudo rm -rf $pbuilderplace/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//')/result/*.dsc @@ -363,7 +363,7 @@ # check for deps -for deps in sudo scp dpkg-scanpackages gzip /usr/sbin/pbuilder; do +for deps in sudo scp dpkg-scanpackages gzip /usr/sbin/pbuilder ccache; do which $deps if [ "$?" -ge "1" ]; then echo "Missing dep: $deps" Modified: trunk/packaging/debian/pbuilder-config =================================================================== --- trunk/packaging/debian/pbuilder-config 2009-05-11 13:10:38 UTC (rev 40589) +++ trunk/packaging/debian/pbuilder-config 2009-05-11 14:46:38 UTC (rev 40590) @@ -22,6 +22,11 @@ # that you can set your own default (i.e. ${ARCH:="i386"}). : ${ARCH:="$(dpkg --print-architecture)"} +# Set the PBUILDERPLACE if none set. +if [ -z "$PBUILDERPLACE" ]; then + PBUILDERPLACE="/var/cache/pbuilder" +fi + NAME="$DIST" if [ -n "${ARCH}" ]; then NAME="$DIST-$ARCH" @@ -29,10 +34,10 @@ fi DISTRIBUTION="$DIST" -BASETGZ="/var/cache/pbuilder/$NAME-base.tgz" -BUILDRESULT="/var/cache/pbuilder/$NAME/result/" -APTCACHE="/var/cache/pbuilder/$NAME/aptcache/" -BUILDPLACE="/var/cache/pbuilder/build/" +BASETGZ="$PBUILDERPLACE/$NAME-base.tgz" +BUILDRESULT="$PBUILDERPLACE/$NAME/result/" +APTCACHE="$PBUILDERPLACE/$NAME/aptcache/" +BUILDPLACE="$PBUILDERPLACE/build/" if $(echo ${DEBIAN_SUITES[@]} | grep -q "$DIST"); then # Debian configuration @@ -56,14 +61,14 @@ ;; esac -OTHERMIRROR="deb file:///var/cache/pbuilder/$NAME/result/ /" +OTHERMIRROR="deb file://$PBUILDERPLACE/$NAME/result/ /" # ccache -sudo mkdir -p /var/cache/pbuilder/ccache -sudo chmod a+w /var/cache/pbuilder/ccache -export CCACHE_DIR="/var/cache/pbuilder/ccache" +sudo mkdir -p $PBUILDERPLACE/ccache +sudo chmod a+w $PBUILDERPLACE/ccache +export CCACHE_DIR="$PBUILDERPLACE/ccache" export PATH="/usr/lib/ccache:${PATH}" -BINDMOUNTS="${CCACHE_DIR} /var/cache/pbuilder/$NAME/result" +BINDMOUNTS="${CCACHE_DIR} $PBUILDERPLACE/$NAME/result" # build dependencies + ccache |
From: Enlightenment S. <no-...@en...> - 2009-05-11 14:58:39
|
Log: Better uncommenting. Author: quaker Date: 2009-05-11 07:58:26 -0700 (Mon, 11 May 2009) New Revision: 40591 Modified: trunk/packaging/debian/e17builder.sh Modified: trunk/packaging/debian/e17builder.sh =================================================================== --- trunk/packaging/debian/e17builder.sh 2009-05-11 14:46:38 UTC (rev 40590) +++ trunk/packaging/debian/e17builder.sh 2009-05-11 14:58:26 UTC (rev 40591) @@ -192,8 +192,8 @@ fi done echo "REVERTING PBUILDERRC BACK..." -sed -i 's/#BINDMOUNTS=/BINDMOUNTS=/g' $HOME/.pbuilderrc -sed -i 's/#OTHERMIRROR=/OTHERMIRROR=/g' $HOME/.pbuilderrc +sed -i 's/#*BINDMOUNTS=/BINDMOUNTS=/g' $HOME/.pbuilderrc +sed -i 's/#*OTHERMIRROR=/OTHERMIRROR=/g' $HOME/.pbuilderrc } setup() { |
From: Enlightenment S. <no-...@en...> - 2009-05-11 16:53:12
|
Log: Updated script. Author: quaker Date: 2009-05-11 09:53:05 -0700 (Mon, 11 May 2009) New Revision: 40593 Modified: trunk/packaging/debian/e17builder.sh Modified: trunk/packaging/debian/e17builder.sh =================================================================== --- trunk/packaging/debian/e17builder.sh 2009-05-11 16:26:58 UTC (rev 40592) +++ trunk/packaging/debian/e17builder.sh 2009-05-11 16:53:05 UTC (rev 40593) @@ -75,6 +75,14 @@ "sid" ) +# architectures to make database for +archs=( +"i386" +"amd64" +"armel" +"lpia" +) + # list of things to compile, comment out things which you don't want to compile, or which are not made for your distro compile_list=( # going to release @@ -314,34 +322,37 @@ esac echo "Making databases." # make database for main section - cd $disto - dpkg-scanpackages --arch $(echo $preparelist | sed 's/.*#//') pool/$(echo $preparelist | sed 's/#.*//')/binaries-$currentversion/main /dev/null | tee Packages - cp Packages Pkgs - gzip -f Packages - mv Pkgs Packages - mv {Packages,Packages.gz} dists/$(echo $preparelist | sed 's/#.*//')/main/binary-$(echo $preparelist | sed 's/.*#//') - # make database for extras section - dpkg-scanpackages --arch $(echo $preparelist | sed 's/.*#//') pool/$(echo $preparelist | sed 's/#.*//')/binaries-$currentversion/extras /dev/null | tee Packages - cp Packages Pkgs - gzip -f Packages - mv Pkgs Packages - mv {Packages,Packages.gz} dists/$(echo $preparelist | sed 's/#.*//')/extras/binary-$(echo $preparelist | sed 's/.*#//') + cd $distr + for dtbarch in ${archs[@]}; do + dpkg-scanpackages --arch $dtbarch pool/$databases/binaries-$currentversion/main /dev/null > Packages + cp Packages Pkgs + gzip -f Packages + mv Pkgs Packages + mv {Packages,Packages.gz} dists/$databases/main/binary-$dtbarch + # make database for extras section + dpkg-scanpackages --arch $dtbarch pool/$databases/binaries-$currentversion/extras /dev/null > Packages + cp Packages Pkgs + gzip -f Packages + mv Pkgs Packages + mv {Packages,Packages.gz} dists/$databases/extras/binary-$dtbarch + done + cd .. echo "Done." - cd .. done } upload() { -for up in ${distros[@]}; do - case $(echo $up | sed 's/#.*//') in - hardy|intrepid|jaunty) distro=ubuntu - ;; - *) distro=debian - ;; - esac - echo "Uploading content." - scp -r $distro $username@$eserver:/var/www/packages -done +up_ubuntu=$(echo "${distros[@]}" | egrep "(hardy|intrepid|jaunty)") +up_debian=$(echo "${distros[@]}" | egrep "(lenny|squeeze|sid)") +if test "$up_ubuntu"; then + echo "Uploading ubuntu dir." + scp -r ubuntu $username@$eserver:/var/www/packages +fi +if test "$up_debian"; then + echo "Uploading debian dir." + scp -r debian $username@$eserver:/var/www/packages +fi +echo "Done uploading." } print_help() { |
From: Enlightenment S. <no-...@en...> - 2009-05-12 15:09:11
|
Log: More user friendly when you want to continue building after fail. Added short versions of arguments. New Clean section which removes local repositories. Author: quaker Date: 2009-05-12 08:09:00 -0700 (Tue, 12 May 2009) New Revision: 40603 Modified: trunk/packaging/debian/README trunk/packaging/debian/e17builder.sh Modified: trunk/packaging/debian/README =================================================================== --- trunk/packaging/debian/README 2009-05-12 14:44:07 UTC (rev 40602) +++ trunk/packaging/debian/README 2009-05-12 15:09:00 UTC (rev 40603) @@ -3,8 +3,9 @@ 2. Copy the script wherever you want 3. Open the script in the text editor and modify variables in the beginning as you want(like compile list, distro list, svn username..) 4. Run a terminal and cd to that dir -5. Run the script with --help and you will see possible parameters and their order(setup, download, makechroots, compile, prepare, database, upload) +5. Run the script with --help and you will see possible parameters and their order(setup, download, makechroots, compile, prepare, database, upload and finally clean if you don't need local repos anymore.) # if you compile for debian squeeze, replace /usr/share/cdbootstrap/suites with suites file here. +# short versions of script arguments are also available( --compile or -c etc.. run the script with --help or -h). quaker66 (trunk/devs/quaker) Modified: trunk/packaging/debian/e17builder.sh =================================================================== --- trunk/packaging/debian/e17builder.sh 2009-05-12 14:44:07 UTC (rev 40602) +++ trunk/packaging/debian/e17builder.sh 2009-05-12 15:09:00 UTC (rev 40603) @@ -268,7 +268,12 @@ cd $basedir sudo DIST="$(echo $distrocomp | sed 's/#.*//')" ARCH="$(echo $distrocomp | sed 's/.*#//')" PBUILDERPLACE="$pbuilderplace" pbuilder update --override-config --buildplace $pbuilderplace/build/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//') --no-targz if [ "$?" -ge "1" ]; then - echo "ERROR, exitting." + echo "ERROR, deleting chroot and updating packed, then exitting." + echo "Deleting chroot." + sudo rm -rf $pbuilderplace/build/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//') + echo "Updating tarball." + sudo DIST="$(echo $distrocomp | sed 's/#.*//')" ARCH="$(echo $distrocomp | sed 's/.*#//')" PBUILDERPLACE="$pbuilderplace" pbuilder update --override-config --basetgz $pbuilderplace/$(echo $distrocomp | sed 's/#.*//')-$(echo $distrocomp | sed 's/.*#//')-base.tgz + echo "Done, EXIT." exit 1 fi done @@ -355,18 +360,30 @@ echo "Done uploading." } +clean() { +for clean in ${distros[@]}; do + echo "Cleaning local repo for: $(echo $chroots | sed 's/#.*//'):$(echo $chroots | sed 's/.*#//')" + sudo rm -rf $pbuilderplace/$(echo $chroots | sed 's/#.*//')-$(echo $chroots | sed 's/.*#//')/result/* + if [ "$?" -ge "1" ]; then + echo "ERROR, exitting." + exit 1 + fi +done +} + print_help() { cat << EOF parameters: ---setup - configure host system for build ---download - download things ---makechroots - make chroots ---compile - compile stuff ---prepare - make tree ---database - make databases ---upload - upload things ---help - show this +--setup|-s - configure host system for build +--download|-d - download things +--makechroots|-m - make chroots +--compile|-c - compile stuff +--prepare|-p - make tree +--database|-D - make databases +--upload|-u - upload things +--clean|-C - removes local repo - run it when you don't need it anymore +--help|-h - show this EOF } @@ -383,7 +400,7 @@ done case $1 in - --setup) setup + --setup|-s) setup ;; esac @@ -394,22 +411,24 @@ fi case $1 in - --download) download + --download|-d) download ;; - --makechroots) makechroots + --makechroots|-m) makechroots ;; - --compile) compile + --compile|-c) compile ;; - --prepare) prepare + --prepare|-p) prepare ;; - --database) database + --database|-D) database ;; - --upload) upload + --upload|-u) upload ;; - --help) print_help + --clean|-C) clean ;; - --setup) exit 0 + --help|-h) print_help ;; + --setup|-s) exit 0 + ;; *) echo "No or bad argument, run it with --help to see what it can do." exit 1 |
From: Enlightenment S. <no-...@en...> - 2009-05-13 16:36:11
|
Log: Fixed script. Author: quaker Date: 2009-05-13 09:35:59 -0700 (Wed, 13 May 2009) New Revision: 40621 Modified: trunk/packaging/debian/e17builder.sh Modified: trunk/packaging/debian/e17builder.sh =================================================================== --- trunk/packaging/debian/e17builder.sh 2009-05-13 15:51:33 UTC (rev 40620) +++ trunk/packaging/debian/e17builder.sh 2009-05-13 16:35:59 UTC (rev 40621) @@ -151,7 +151,7 @@ echo "DOWNLOADING PACKAGES WITH SCP..." for down in ${compile_list[@]}; do case $down in - eina|eet|evas|ecore|embryo|edje|edbus|efreet|e17) scp -r $username@$eserver:$path/main/$down ./ + eina|eet|evas|ecore|embryo|edje|e_dbus|efreet|e17) scp -r $username@$eserver:$path/main/$down ./ ;; *) scp -r $username@$eserver:$path/extras/$down ./ ;; |
From: Enlightenment S. <no-...@en...> - 2009-05-16 10:40:56
|
Log: Rewritten md5 check. Author: quaker Date: 2009-05-16 03:40:52 -0700 (Sat, 16 May 2009) New Revision: 40684 Modified: trunk/packaging/debian/e17builder.sh Modified: trunk/packaging/debian/e17builder.sh =================================================================== --- trunk/packaging/debian/e17builder.sh 2009-05-16 08:09:34 UTC (rev 40683) +++ trunk/packaging/debian/e17builder.sh 2009-05-16 10:40:52 UTC (rev 40684) @@ -160,27 +160,49 @@ echo "DOWNLOADING MD5SUMS..." wget $md5path echo "CHECKING MD5SUMS..." -for md5 in $(find . -name '*.*[.dsc,.tar.gz]'); do - if [ "$(md5sum $md5 | sed 's/ .*//')" = "$(cat SOURCES-MD5 | grep "$(echo $md5 | sed 's/.\///')" | sed 's/ .*//')" ]; then - echo "$md5: MD5 OK" +for md5 in ${compile_list[@]}; do + case $md5 in + e_dbus) check="edbus" + ;; + e) check="e17" + ;; + edje_editor) check="edje-editor" + ;; + E-MODULES-EXTRA) check="emodules" + ;; + python-e_dbus) check="python-edbus" + ;; + python-efl_utils) check="python-efl-utils" + ;; + *) check="$md5" + ;; + esac + check() + { + if [ "$(md5sum $md5/$check*.$1 | sed 's/ .*//')" = "$(cat SOURCES-MD5 | grep "$md5/$check.*.$1" | sed 's/ .*//')" ]; then + echo "$md5 $1 file: MD5 OK" else badchecksums="1" - echo "$md5: MD5 bad, downloading again." while badchecksums="1"; do - rm $md5 - if test $(echo $md5 | egrep "(eina|eet|evas|ecore|embryo|edje|edbus|efreet|e17)"); then - scp -r $username@$eserver:$path/main/$(echo $md5 | sed 's/.\///') $md5 + filename=$(ls $md5 | grep "$check.*.$1") + rm $md5/$filename + if test $(echo $check | egrep "(^eina$|^eet$|^evas$|^ecore$|^embryo$|^edje$|^edbus$|^efreet$|^e17$)"); then + scp -r $username@$eserver:$path/main/$md5/$filename $md5/$filename else - scp -r $username@$eserver:$path/extras/$(echo $md5 | sed 's/.\///') $md5 + scp -r $username@$eserver:$path/extras/$md5/$filename $md5/$filename fi - if [ "$(md5sum $md5 | sed 's/ .*//')" = "$(cat SOURCES-MD5 | grep "$(echo $md5 | sed 's/.\///')" | sed 's/ .*//')" ]; then + if [ "$(md5sum $md5/$check*.$1 | sed 's/ .*//')" = "$(cat SOURCES-MD5 | grep "$md5/$check.*.$1" | sed 's/ .*//')" ]; then echo "MD5 OK now." badchecksums="0" + break else echo "MD5 bad again. How this is possible?" fi done fi + } + check dsc + check tar.gz done rm SOURCES-MD5 echo "DONE DOWNLOADING..." |
From: Enlightenment S. <no-...@en...> - 2009-05-16 10:48:07
|
Log: Updated script. Author: quaker Date: 2009-05-16 03:47:50 -0700 (Sat, 16 May 2009) New Revision: 40685 Modified: trunk/packaging/debian/e17builder.sh Modified: trunk/packaging/debian/e17builder.sh =================================================================== --- trunk/packaging/debian/e17builder.sh 2009-05-16 10:40:52 UTC (rev 40684) +++ trunk/packaging/debian/e17builder.sh 2009-05-16 10:47:50 UTC (rev 40685) @@ -374,10 +374,12 @@ if test "$up_ubuntu"; then echo "Uploading ubuntu dir." scp -r ubuntu $username@$eserver:/var/www/packages + ssh $username@$eserver "chgrp -R www-data /var/www/packages/ubuntu" fi if test "$up_debian"; then echo "Uploading debian dir." scp -r debian $username@$eserver:/var/www/packages + ssh $username@$eserver "chgrp -R www-data /var/www/packages/debian" fi echo "Done uploading." } |
From: Enlightenment S. <no-...@en...> - 2009-05-17 14:14:48
|
Log: Fixed upload. Author: quaker Date: 2009-05-17 07:14:42 -0700 (Sun, 17 May 2009) New Revision: 40700 Modified: trunk/packaging/debian/e17builder.sh Modified: trunk/packaging/debian/e17builder.sh =================================================================== --- trunk/packaging/debian/e17builder.sh 2009-05-17 13:42:48 UTC (rev 40699) +++ trunk/packaging/debian/e17builder.sh 2009-05-17 14:14:42 UTC (rev 40700) @@ -373,11 +373,13 @@ up_debian=$(echo "${distros[@]}" | egrep "(lenny|squeeze|sid)") if test "$up_ubuntu"; then echo "Uploading ubuntu dir." + chmod -r 775 ubuntu scp -r ubuntu $username@$eserver:/var/www/packages ssh $username@$eserver "chgrp -R www-data /var/www/packages/ubuntu" fi if test "$up_debian"; then echo "Uploading debian dir." + chmod -r 775 debian scp -r debian $username@$eserver:/var/www/packages ssh $username@$eserver "chgrp -R www-data /var/www/packages/debian" fi |
From: Enlightenment S. <no-...@en...> - 2009-05-17 14:21:17
|
Log: Updated script. Author: quaker Date: 2009-05-17 07:21:12 -0700 (Sun, 17 May 2009) New Revision: 40701 Modified: trunk/packaging/debian/README trunk/packaging/debian/e17builder.sh trunk/packaging/debian/suites Modified: trunk/packaging/debian/README =================================================================== --- trunk/packaging/debian/README 2009-05-17 14:14:42 UTC (rev 40700) +++ trunk/packaging/debian/README 2009-05-17 14:21:12 UTC (rev 40701) @@ -5,7 +5,7 @@ 4. Run a terminal and cd to that dir 5. Run the script with --help and you will see possible parameters and their order(setup, download, makechroots, compile, prepare, database, upload and finally clean if you don't need local repos anymore.) -# if you compile for debian squeeze, replace /usr/share/cdbootstrap/suites with suites file here. +# if you compile for debian squeeze or ubuntu jaunty, replace /usr/share/cdbootstrap/suites with suites file here. # short versions of script arguments are also available( --compile or -c etc.. run the script with --help or -h). quaker66 (trunk/devs/quaker) Modified: trunk/packaging/debian/e17builder.sh =================================================================== --- trunk/packaging/debian/e17builder.sh 2009-05-17 14:14:42 UTC (rev 40700) +++ trunk/packaging/debian/e17builder.sh 2009-05-17 14:21:12 UTC (rev 40701) @@ -215,7 +215,8 @@ echo "CREATING CHROOTS..." for chroots in ${distros[@]}; do echo "Creating chroot: $(echo $chroots | sed 's/#.*//'):$(echo $chroots | sed 's/.*#//')" - sudo DIST=$(echo $chroots | sed 's/#.*//') ARCH=$(echo $chroots | sed 's/.*#//') PBUILDERPLACE="$pbuilderplace" pbuilder create --basetgz $pbuilderplace/$(echo $chroots | sed 's/#.*//')-$(echo $chroots | sed 's/.*#//')-base.tgz --buildplace $pbuilderplace/build/$(echo $chroots | sed 's/#.*//')-$(echo $chroots | sed 's/.*#//') + sudo mkdir $pbuilderplace/build/$(echo $chroots | sed 's/#.*//')-$(echo $chroots | sed 's/.*#//') + sudo DIST=$(echo $chroots | sed 's/#.*//') ARCH=$(echo $chroots | sed 's/.*#//') PBUILDERPLACE="$pbuilderplace" pbuilder create --basetgz $pbuilderplace/$(echo $chroots | sed 's/#.*//')-$(echo $chroots | sed 's/.*#//')-base.tgz --buildplace $pbuilderplace/build if [ "$?" -ge "1" ]; then echo "ERROR, exitting." exit 1 Modified: trunk/packaging/debian/suites =================================================================== --- trunk/packaging/debian/suites 2009-05-17 14:14:42 UTC (rev 40700) +++ trunk/packaging/debian/suites 2009-05-17 14:21:12 UTC (rev 40701) @@ -46,6 +46,10 @@ Config: generic-ubuntu Keyring: ubuntu-archive-keyring.gpg +Suite: jaunty +Config: generic-ubuntu +Keyring: ubuntu-archive-keyring.gpg + Suite: oldstable Keyring: debian-archive-keyring.gpg |
From: Enlightenment S. <no-...@en...> - 2009-05-17 16:46:57
|
Log: Added a workaround for ubuntu jaunty into script - cdebootstrap does not install sysv-rc in jaunty by default, propably because of a bug in jaunty dependencies, and chroot creation fails. And also added a condition - if folder pbuilderplace/build/distro-arch exists, it does not create it. Author: quaker Date: 2009-05-17 09:46:52 -0700 (Sun, 17 May 2009) New Revision: 40707 Modified: trunk/packaging/debian/e17builder.sh Modified: trunk/packaging/debian/e17builder.sh =================================================================== --- trunk/packaging/debian/e17builder.sh 2009-05-17 16:01:41 UTC (rev 40706) +++ trunk/packaging/debian/e17builder.sh 2009-05-17 16:46:52 UTC (rev 40707) @@ -215,8 +215,8 @@ echo "CREATING CHROOTS..." for chroots in ${distros[@]}; do echo "Creating chroot: $(echo $chroots | sed 's/#.*//'):$(echo $chroots | sed 's/.*#//')" - sudo mkdir $pbuilderplace/build/$(echo $chroots | sed 's/#.*//')-$(echo $chroots | sed 's/.*#//') - sudo DIST=$(echo $chroots | sed 's/#.*//') ARCH=$(echo $chroots | sed 's/.*#//') PBUILDERPLACE="$pbuilderplace" pbuilder create --basetgz $pbuilderplace/$(echo $chroots | sed 's/#.*//')-$(echo $chroots | sed 's/.*#//')-base.tgz --buildplace $pbuilderplace/build + [ ! -d "$pbuilderplace/build/$(echo $chroots | sed 's/#.*//')-$(echo $chroots | sed 's/.*#//')" ] && sudo mkdir $pbuilderplace/build/$(echo $chroots | sed 's/#.*//')-$(echo $chroots | sed 's/.*#//') + sudo DIST=$(echo $chroots | sed 's/#.*//') ARCH=$(echo $chroots | sed 's/.*#//') PBUILDERPLACE="$pbuilderplace" pbuilder create --basetgz $pbuilderplace/$(echo $chroots | sed 's/#.*//')-$(echo $chroots | sed 's/.*#//')-base.tgz --buildplace $pbuilderplace/build --debootstrapopts --include=sysv-rc if [ "$?" -ge "1" ]; then echo "ERROR, exitting." exit 1 |
From: Enlightenment S. <no-...@en...> - 2009-05-17 17:24:48
|
Log: Fixed script. Author: quaker Date: 2009-05-17 10:24:42 -0700 (Sun, 17 May 2009) New Revision: 40708 Modified: trunk/packaging/debian/e17builder.sh Modified: trunk/packaging/debian/e17builder.sh =================================================================== --- trunk/packaging/debian/e17builder.sh 2009-05-17 16:46:52 UTC (rev 40707) +++ trunk/packaging/debian/e17builder.sh 2009-05-17 17:24:42 UTC (rev 40708) @@ -215,12 +215,14 @@ echo "CREATING CHROOTS..." for chroots in ${distros[@]}; do echo "Creating chroot: $(echo $chroots | sed 's/#.*//'):$(echo $chroots | sed 's/.*#//')" - [ ! -d "$pbuilderplace/build/$(echo $chroots | sed 's/#.*//')-$(echo $chroots | sed 's/.*#//')" ] && sudo mkdir $pbuilderplace/build/$(echo $chroots | sed 's/#.*//')-$(echo $chroots | sed 's/.*#//') + sudo mkdir $pbuilderplace/build/$(echo $chroots | sed 's/#.*//')-$(echo $chroots | sed 's/.*#//') sudo DIST=$(echo $chroots | sed 's/#.*//') ARCH=$(echo $chroots | sed 's/.*#//') PBUILDERPLACE="$pbuilderplace" pbuilder create --basetgz $pbuilderplace/$(echo $chroots | sed 's/#.*//')-$(echo $chroots | sed 's/.*#//')-base.tgz --buildplace $pbuilderplace/build --debootstrapopts --include=sysv-rc if [ "$?" -ge "1" ]; then echo "ERROR, exitting." + sudo rm -rf $pbuilderplace/build/$(echo $chroots | sed 's/#.*//')-$(echo $chroots | sed 's/.*#//') exit 1 fi + sudo rm -rf $pbuilderplace/build/$(echo $chroots | sed 's/#.*//')-$(echo $chroots | sed 's/.*#//') done echo "REVERTING PBUILDERRC BACK..." sed -i 's/#*BINDMOUNTS=/BINDMOUNTS=/g' $HOME/.pbuilderrc |
From: Enlightenment S. <no-...@en...> - 2009-05-19 15:27:13
|
Log: Move script to rsync. Author: quaker Date: 2009-05-19 08:27:10 -0700 (Tue, 19 May 2009) New Revision: 40747 Modified: trunk/packaging/debian/e17builder.sh Modified: trunk/packaging/debian/e17builder.sh =================================================================== --- trunk/packaging/debian/e17builder.sh 2009-05-19 15:14:19 UTC (rev 40746) +++ trunk/packaging/debian/e17builder.sh 2009-05-19 15:27:10 UTC (rev 40747) @@ -148,12 +148,12 @@ # functions download() { -echo "DOWNLOADING PACKAGES WITH SCP..." +echo "DOWNLOADING PACKAGES WITH RSYNC..." for down in ${compile_list[@]}; do case $down in - eina|eet|evas|ecore|embryo|edje|e_dbus|efreet|e17) scp -r $username@$eserver:$path/main/$down ./ + eina|eet|evas|ecore|embryo|edje|e_dbus|efreet|e17) rsync --partial --progress --recursive --rsh=ssh $username@$eserver:$path/main/$down ./ ;; - *) scp -r $username@$eserver:$path/extras/$down ./ + *) rsync --partial --progress --recursive --rsh=ssh $username@$eserver:$path/extras/$down ./ ;; esac done @@ -187,9 +187,9 @@ filename=$(ls $md5 | grep "$check.*.$1") rm $md5/$filename if test $(echo $check | egrep "(^eina$|^eet$|^evas$|^ecore$|^embryo$|^edje$|^edbus$|^efreet$|^e17$)"); then - scp -r $username@$eserver:$path/main/$md5/$filename $md5/$filename + rsync --partial --progress --recursive --rsh=ssh $username@$eserver:$path/main/$md5/$filename $md5/$filename else - scp -r $username@$eserver:$path/extras/$md5/$filename $md5/$filename + rsync --partial --progress --recursive --rsh=ssh $username@$eserver:$path/extras/$md5/$filename $md5/$filename fi if [ "$(md5sum $md5/$check*.$1 | sed 's/ .*//')" = "$(cat SOURCES-MD5 | grep "$md5/$check.*.$1" | sed 's/ .*//')" ]; then echo "MD5 OK now." @@ -231,7 +231,7 @@ setup() { echo "INSTALLING PBUILDER..." -sudo apt-get --assume-yes --force-yes install pbuilder debootstrap devscripts ccache +sudo apt-get --assume-yes --force-yes install pbuilder debootstrap devscripts ccache rsync openssh-client echo "INSTALLING UBUNTU KEYRING..." if [ -z "$(dpkg -l | grep ii | grep ubuntu-keyring)" ]; then wget http://archive.ubuntu.com/ubuntu/pool/main/u/ubuntu-keyring/ubuntu-keyring_2008.03.04_all.deb @@ -377,13 +377,13 @@ if test "$up_ubuntu"; then echo "Uploading ubuntu dir." chmod -r 775 ubuntu - scp -r ubuntu $username@$eserver:/var/www/packages + rsync --partial --progress --recursive --rsh=ssh ubuntu $username@$eserver:/var/www/packages ssh $username@$eserver "chgrp -R www-data /var/www/packages/ubuntu" fi if test "$up_debian"; then echo "Uploading debian dir." chmod -r 775 debian - scp -r debian $username@$eserver:/var/www/packages + rsync --partial --progress --recursive --rsh=ssh debian $username@$eserver:/var/www/packages ssh $username@$eserver "chgrp -R www-data /var/www/packages/debian" fi echo "Done uploading." @@ -420,7 +420,7 @@ # check for deps -for deps in sudo scp dpkg-scanpackages gzip /usr/sbin/pbuilder ccache; do +for deps in sudo rsync ssh dpkg-scanpackages gzip /usr/sbin/pbuilder ccache; do which $deps if [ "$?" -ge "1" ]; then echo "Missing dep: $deps" |
From: Enlightenment S. <no-...@en...> - 2009-05-19 16:11:37
|
Log: Script fix. Author: quaker Date: 2009-05-19 09:11:27 -0700 (Tue, 19 May 2009) New Revision: 40748 Modified: trunk/packaging/debian/e17builder.sh Modified: trunk/packaging/debian/e17builder.sh =================================================================== --- trunk/packaging/debian/e17builder.sh 2009-05-19 15:27:10 UTC (rev 40747) +++ trunk/packaging/debian/e17builder.sh 2009-05-19 16:11:27 UTC (rev 40748) @@ -376,13 +376,13 @@ up_debian=$(echo "${distros[@]}" | egrep "(lenny|squeeze|sid)") if test "$up_ubuntu"; then echo "Uploading ubuntu dir." - chmod -r 775 ubuntu + chmod -R 775 ubuntu rsync --partial --progress --recursive --rsh=ssh ubuntu $username@$eserver:/var/www/packages ssh $username@$eserver "chgrp -R www-data /var/www/packages/ubuntu" fi if test "$up_debian"; then echo "Uploading debian dir." - chmod -r 775 debian + chmod -R 775 debian rsync --partial --progress --recursive --rsh=ssh debian $username@$eserver:/var/www/packages ssh $username@$eserver "chgrp -R www-data /var/www/packages/debian" fi |
From: Enlightenment S. <no-...@en...> - 2009-05-21 14:31:59
|
Log: Fixed pbuilderrc. Author: quaker Date: 2009-05-21 06:30:56 -0700 (Thu, 21 May 2009) New Revision: 40759 Modified: trunk/packaging/debian/pbuilder-config Modified: trunk/packaging/debian/pbuilder-config =================================================================== --- trunk/packaging/debian/pbuilder-config 2009-05-20 17:56:00 UTC (rev 40758) +++ trunk/packaging/debian/pbuilder-config 2009-05-21 13:30:56 UTC (rev 40759) @@ -16,7 +16,7 @@ # Mirrors to use. Update these to your preferred mirror. DEBIAN_MIRROR="ftp.debian.org" UBUNTU_MIRROR="archive.ubuntu.com" -UBUNTU_PORTS_MIRROR="http://ports.ubuntu.com" +UBUNTU_PORTS_MIRROR="ports.ubuntu.com" # Optionally set the architecture to the host architecture if none set. Note # that you can set your own default (i.e. ${ARCH:="i386"}). |