sablink/molecules
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[molecules/*amazon*] unmask icedtea-bin (allow Java7 to be pulled in)

Browse Source
This commit is contained in:
Fabio Erculiani 2012-08-01 12:01:47 +02:00
parent 85e7f29b01
commit 254b1fdd8a
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
molecules/spinbase-amazon-ami-ebs-image.common
View File

@ -73,11 +73,6 @@ packages_to_add:
sys-kernel/linux-ec2, sys-kernel/linux-ec2,
sys-process/atop sys-process/atop
# NOTE:
# once dev-java/oracle-jre-bin is in Entropy, please
# migrate to it (from oracle-jdk-bin), forcing dev-java/oracle-jre-bin
# in the dependencies and unmasking icedtea and icedtea-bin
# Custom shell call to packages add (default is: equo install) # Custom shell call to packages add (default is: equo install)
# custom_packages_add_cmd: # custom_packages_add_cmd:

7
scripts/amazon_ebs_image_inner_chroot_script.sh
View File

@ -22,9 +22,6 @@ for repo_conf in /etc/entropy/repositories.conf /etc/entropy/repositories.conf.d
-i "${repo_conf}" -i "${repo_conf}"
done done
# mask icedtea and icedtea-bin, waiting to have virtual/jre-1.7.0 and # mask icedtea, since it pulls it a shitload of deps
# dev-java/oracle-jre-bin in Entropy # prefer icedtea-bin or others
# Once there, remove this script and use "remaster_generic_inner_chroot_script.sh"
# instead.
equo mask "dev-java/icedtea-bin"
equo mask "dev-java/icedtea" equo mask "dev-java/icedtea"