diff options
| author | axis <qt-info@nokia.com> | 2010-11-12 10:49:11 +0100 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-11-12 10:49:42 +0100 |
| commit | 1b721da3d01377408a7b738390a3bb0105681329 (patch) | |
| tree | 87dedb246333d6d247cc40202d7d3780c43988c0 | |
| parent | 1ed9a6f1e79cea3486ebebfda849b5f5c29e8c4e (diff) | |
Fixed some access violations in gcce ebuild.
| -rw-r--r-- | sys-devel/gcce/Manifest | 2 | ||||
| -rw-r--r-- | sys-devel/gcce/gcce-4.4.172.ebuild | 15 |
2 files changed, 15 insertions, 2 deletions
diff --git a/sys-devel/gcce/Manifest b/sys-devel/gcce/Manifest index 42eb870..c02ca64 100644 --- a/sys-devel/gcce/Manifest +++ b/sys-devel/gcce/Manifest @@ -1,2 +1,2 @@ DIST symbian-adt-4.4-172-arm-none-symbianelf.bin 100372619 RMD160 e49f65905b4c6bfec5af02995405e23068fc1f49 SHA1 ef9245dd9c95f1211f4f66f2a5b496cd1dcc944e SHA256 0b1f9b253af7f717ea079d28e759666f3eada644525f7c012c5dbfe1ee0dc2c5 -EBUILD gcce-4.4.172.ebuild 1933 RMD160 de442a5a481179ba858fe4a69966bb51d8b5338d SHA1 f107bf4fcfcd0effa7178f2823bc0757caa72c27 SHA256 a2f9ed9f0677aeca2f1f8cb9c98658338115f3ef522eb7ce1d34f85fc3ed2e72 +EBUILD gcce-4.4.172.ebuild 2526 RMD160 706e0d8909165d1c400ea2af2250278ba88b02e0 SHA1 d5e0fb009e499e2f91f61117a4bce564494db551 SHA256 9f79c15657b1ffb66b163fef6753d66651211edf669a7b1e39cc1e19e9a30395 diff --git a/sys-devel/gcce/gcce-4.4.172.ebuild b/sys-devel/gcce/gcce-4.4.172.ebuild index 0795ce8..5bd51c2 100644 --- a/sys-devel/gcce/gcce-4.4.172.ebuild +++ b/sys-devel/gcce/gcce-4.4.172.ebuild @@ -31,6 +31,14 @@ src_install() { mkdir ${D}/temphome export HOME=${D}/temphome + # It's tempting to use addpredict here to avoid actual writes, but the sandbox is + # not able to stop the writes, so it's better to be honest, enable writes, and + # just take precautions. + addwrite /root + if [ -f /root/.com.zerog.registry.xml ]; then + cp /root/.com.zerog.registry.xml /root/.com.zerog.registry.xml.EBUILD-BACKUP + fi + chmod u+x ${A} einfo "Launching installer..." ( @@ -59,6 +67,11 @@ y EOF ) | ./${A} -i console >/dev/null + rm -f /root/.com.zerog.registry.xml + if [ -f /root/.com.zerog.registry.xml.EBUILD-BACKUP ]; then + mv /root/.com.zerog.registry.xml.EBUILD-BACKUP /root/.com.zerog.registry.xml + fi + export HOME=$oldHOME rm -rf ${D}/temphome @@ -71,7 +84,7 @@ EOF ln -s ../arm-none-symbianelf/bin/* . popd - einfo "Removing useless unneeded files..." + einfo "Removing unneeded files..." rm -rf ${D}usr/arm-none-symbianelf/[Uu]ninstall* rm -rf ${D}usr/arm-none-symbianelf/jre } |