From 68972bc31da5e8a12657ac0094c28f02b26cb1ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Rodr=C3=ADguez?= <ruben@trisquel.info> Date: Fri, 14 Dec 2012 13:27:00 +0100 Subject: [PATCH] Updated compiz and linux --- helpers/make-compiz | 2 +- helpers/make-linux | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/helpers/make-compiz b/helpers/make-compiz index 80c9367f..ea0df26f 100644 --- a/helpers/make-compiz +++ b/helpers/make-compiz @@ -22,7 +22,7 @@ COMPONENT=main . ./config -patch -p1 < $DATA/fix-974242.patch +#patch -p1 < $DATA/fix-974242.patch cp $DATA/config.patch debian/patches/config.patch sed 's/ubuntu-config/config/' -i debian/patches/series diff --git a/helpers/make-linux b/helpers/make-linux index 975a5264..e1c90c47 100644 --- a/helpers/make-linux +++ b/helpers/make-linux @@ -46,10 +46,10 @@ echo > debian.master/d-i/firmware/scsi-modules echo > debian.master/d-i/firmware/nic-modules # Removing some extra Ubuntu modules -rm -rf ubuntu/ndiswrapper -sed /ndiswrapper/d -i ubuntu/Makefile ubuntu/Kconfig -rm -rf ubuntu/rtl8192se -sed /rtl8192se/d ubuntu/Makefile ubuntu/Kconfig -i +#rm -rf ubuntu/ndiswrapper +#sed /ndiswrapper/d -i ubuntu/Makefile ubuntu/Kconfig +#rm -rf ubuntu/rtl8192se +#sed /rtl8192se/d ubuntu/Makefile ubuntu/Kconfig -i # Compile with less modules and avoid abi check echo 'skipmodule = true' >> debian.master/rules.d/0-common-vars.mk @@ -67,4 +67,4 @@ changelog "Removed non-free bits" cp debian/changelog debian.master/changelog -compile +PARALLEL=true compile -- GitLab