[Trisquel-devel] Rev 30: Parallel compilation disabled by default. Merged hplip from Kour in file:///home/bzr/package-helpers/trunk/
Ruben Rodriguez
ruben at trisquel.info
Mon Dec 12 18:51:00 CET 2011
At file:///home/bzr/package-helpers/trunk/
------------------------------------------------------------
revno: 30 [merge]
revision-id: ruben en trisquel.info-20111212175406-7dayymnlg2v4we7b
parent: ruben en trisquel.info-20111210162653-jrnn66ogiwgoum11
parent: kour en member.trisquel.info-20111210180346-kjgkig6u8uheh2x1
committer: Ruben Rodriguez <ruben en trisquel.info>
branch nick: trunk
timestamp: Mon 2011-12-12 18:54:06 +0100
message:
Parallel compilation disabled by default. Merged hplip from Kour
added:
helpers/natty/make-hplip makehplip-20111210180322-u73ghqmux1oeapzv-1
modified:
helpers/lucid/config config-20110303145326-lgk7o7lrhi225xd4-79
helpers/lucid/make-apt makeapt-20110303145326-lgk7o7lrhi225xd4-82
helpers/lucid/make-linux makelinux-20110303145326-lgk7o7lrhi225xd4-106
helpers/lucid/make-linux-lts-backport-natty makelinuxltsbackport-20111207005245-agm59co43mtta43c-1
helpers/lucid/make-samba makesamba-20110303145326-lgk7o7lrhi225xd4-122
helpers/natty/config config-20110714195810-sdvcz1uc838cqq0f-3
helpers/natty/make-apt makeapt-20110714195810-sdvcz1uc838cqq0f-7
helpers/natty/make-devede makedevede-20111013183006-kort5vdojg012ppm-14
helpers/natty/make-gtk+2.0 makegtk2.0-20111013183006-kort5vdojg012ppm-21
helpers/natty/make-launchpad-integration makelaunchpadintegra-20110714195810-sdvcz1uc838cqq0f-37
helpers/natty/make-linux makelinux-20110714195810-sdvcz1uc838cqq0f-40
helpers/natty/make-newt makenewt-20111013183006-kort5vdojg012ppm-34
helpers/natty/make-samba makesamba-20110714195810-sdvcz1uc838cqq0f-59
helpers/natty/make-ubiquity makeubiquity-20110714195810-sdvcz1uc838cqq0f-64
helpers/natty/make-update-manager makeupdatemanager-20110714195810-sdvcz1uc838cqq0f-67
makepackage makepackage-20110303145326-lgk7o7lrhi225xd4-4
------------ pr�xima parte ------------
=== modified file 'helpers/lucid/config'
--- a/helpers/lucid/config 2011-10-13 18:33:43 +0000
+++ b/helpers/lucid/config 2011-12-12 17:54:06 +0000
@@ -54,8 +54,6 @@
LOCALMIRROR=http://archive.trisquel.info/trisquel
DEVELMIRROR=http://devel.trisquel.info/trisquel
-export PARALLEL=true
-
cat << EOF > /etc/lsb-release
DISTRIB_ID=Trisquel
DISTRIB_RELEASE=$REVISION
@@ -130,7 +128,7 @@
compile(){
PROCESSORS=1
-if $PARALLEL
+if [ 1$PARALLEL = "1true" ]
then
PROCESSORS=$(grep processor /proc/cpuinfo | wc -l)
fi
=== modified file 'helpers/lucid/make-apt'
--- a/helpers/lucid/make-apt 2011-03-03 14:54:19 +0000
+++ b/helpers/lucid/make-apt 2011-12-12 17:54:06 +0000
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=1
+VERSION=2
. ./config
=== modified file 'helpers/lucid/make-linux'
--- a/helpers/lucid/make-linux 2011-07-30 15:29:58 +0000
+++ b/helpers/lucid/make-linux 2011-12-12 17:54:06 +0000
@@ -59,5 +59,4 @@
cp debian/changelog debian.master/changelog
-PARALLEL=false compile
-#compile
+compile
=== modified file 'helpers/lucid/make-linux-lts-backport-natty'
--- a/helpers/lucid/make-linux-lts-backport-natty 2011-12-07 00:53:23 +0000
+++ b/helpers/lucid/make-linux-lts-backport-natty 2011-12-12 17:54:06 +0000
@@ -63,5 +63,4 @@
cp debian/changelog debian.master/changelog
-#PARALLEL=false compile
-#compile
+compile
=== modified file 'helpers/lucid/make-samba'
--- a/helpers/lucid/make-samba 2011-03-03 14:54:19 +0000
+++ b/helpers/lucid/make-samba 2011-12-12 17:54:06 +0000
@@ -25,5 +25,5 @@
changelog "Compiled for Trisquel"
-PARALLEL=false compile
+compile
=== modified file 'helpers/natty/config'
--- a/helpers/natty/config 2011-12-07 00:53:23 +0000
+++ b/helpers/natty/config 2011-12-12 17:54:06 +0000
@@ -55,8 +55,6 @@
DEVELMIRROR=http://devel.trisquel.info/trisquel
LOCALMIRROR=http://archive.trisquel.info/trisquel
-export PARALLEL=true
-
cat << EOF > /etc/lsb-release
DISTRIB_ID=Trisquel
DISTRIB_RELEASE=$REVISION
@@ -117,7 +115,7 @@
compile(){
PROCESSORS=1
-if $PARALLEL
+if [ 1$PARALLEL = "1true" ]
then
PROCESSORS=$(grep processor /proc/cpuinfo | wc -l)
fi
=== modified file 'helpers/natty/make-apt'
--- a/helpers/natty/make-apt 2011-07-14 19:58:25 +0000
+++ b/helpers/natty/make-apt 2011-12-12 17:54:06 +0000
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=1
+VERSION=2
. ./config
=== modified file 'helpers/natty/make-devede'
--- a/helpers/natty/make-devede 2011-10-13 18:33:43 +0000
+++ b/helpers/natty/make-devede 2011-12-12 17:54:06 +0000
@@ -27,6 +27,5 @@
changelog "Imported into Trisquel"
-#PARALLEL=false compile
compile
=== modified file 'helpers/natty/make-gtk+2.0'
--- a/helpers/natty/make-gtk+2.0 2011-10-13 18:33:43 +0000
+++ b/helpers/natty/make-gtk+2.0 2011-12-12 17:54:06 +0000
@@ -25,5 +25,5 @@
changelog "Disabled resize grips by default"
-PARALLEL=false compile
+compile
=== added file 'helpers/natty/make-hplip'
--- a/helpers/natty/make-hplip 1970-01-01 00:00:00 +0000
+++ b/helpers/natty/make-hplip 2011-12-12 17:54:06 +0000
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# Copyright (C) 2011 Manuel Pedreira <kour en member.trisquel.info>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+
+VERSION=3
+
+. ./config
+
+
+file1=`mktemp`
+file2=`mktemp`
+file3=`mktemp`
+final='data/models/models.dat'
+
+grep -B 7 'download=True' $final|grep "\["|sed 's/\[//g; s/\]//g' > $file3
+for i in `cat $file3`; do
+ sed '/\['"$i"'\]/,/^$/d' $file1 > $file2
+ cp $file2 $file1
+done
+sed 's/plugin=2/plugin=0/g' $file1 > $final
+ cp $file1 $final
+
+rm $file1 $file2 $file3
+
+rm debian/patches/hp_photosmart_pro_b9100_support.dpatch
+sed -i '/hp_photosmart_pro_b9100_support.dpatch/d' debian/patches/00list
+
+changelog "Removed printers with propietary drivers(required and optional)"
+
+compile
+
=== modified file 'helpers/natty/make-launchpad-integration'
--- a/helpers/natty/make-launchpad-integration 2011-07-30 15:29:58 +0000
+++ b/helpers/natty/make-launchpad-integration 2011-12-12 17:54:06 +0000
@@ -25,5 +25,5 @@
changelog "Removed /usr/bin/launchpad-integration, fixes #3211"
-PARALLEL=false compile
+compile
=== modified file 'helpers/natty/make-linux'
--- a/helpers/natty/make-linux 2011-07-14 19:58:25 +0000
+++ b/helpers/natty/make-linux 2011-12-12 17:54:06 +0000
@@ -63,5 +63,4 @@
cp debian/changelog debian.master/changelog
-PARALLEL=false compile
-#compile
+compile
=== modified file 'helpers/natty/make-newt'
--- a/helpers/natty/make-newt 2011-10-13 18:33:43 +0000
+++ b/helpers/natty/make-newt 2011-12-12 17:54:06 +0000
@@ -35,5 +35,5 @@
changelog "Color palette set back to default"
-PARALLEL=false compile
+compile
=== modified file 'helpers/natty/make-samba'
--- a/helpers/natty/make-samba 2011-07-14 19:58:25 +0000
+++ b/helpers/natty/make-samba 2011-12-12 17:54:06 +0000
@@ -25,5 +25,5 @@
changelog "Compiled for Trisquel"
-PARALLEL=false compile
+compile
=== modified file 'helpers/natty/make-ubiquity'
--- a/helpers/natty/make-ubiquity 2011-09-29 00:17:35 +0000
+++ b/helpers/natty/make-ubiquity 2011-12-12 17:54:06 +0000
@@ -145,5 +145,5 @@
rm -rf debian/source
-PARALLEL=false compile
+compile
=== modified file 'helpers/natty/make-update-manager'
--- a/helpers/natty/make-update-manager 2011-09-29 00:17:35 +0000
+++ b/helpers/natty/make-update-manager 2011-12-12 17:54:06 +0000
@@ -359,5 +359,5 @@
changelog "Compiled for Trisquel"
-PARALLEL=false compile
+compile
=== modified file 'makepackage'
--- a/makepackage 2011-11-07 19:41:50 +0000
+++ b/makepackage 2011-12-12 17:54:06 +0000
@@ -22,7 +22,7 @@
export LANG=C
export LANGUAGE=C
-cd /home/systems/devel
+cd $(dirname $0)
if [ $# != 2 ]
then
@@ -56,6 +56,12 @@
mount none $CHROOT/proc -t proc
mount none $CHROOT/dev/pts -t devpts
+ # Disable service starter scripts
+ mv $CHROOT/sbin/start $CHROOT/sbin/start.real
+ mv $CHROOT/sbin/start-stop-daemon $CHROOT/sbin/start-stop-daemon.real
+ cp $CHROOT/bin/true $CHROOT/sbin/start-stop-daemon
+ cp $CHROOT/bin/true $CHROOT/sbin/start
+
echo $DISTRO-$ARCH > $CHROOT/etc/debian_chroot
cat << EOF > $CHROOT/etc/apt/sources.list
deb $MIRROR $DISTRO main universe
More information about the Trisquel-devel
mailing list