Merge branch 'master' of git+ssh://git.gentoo.org/proj/releng
This commit is contained in:
commit
8256f91062
28 changed files with 7983 additions and 32 deletions
3955
releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
Normal file
3955
releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
Normal file
File diff suppressed because it is too large
Load diff
3875
releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
Normal file
3875
releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
Normal file
File diff suppressed because it is too large
Load diff
|
@ -0,0 +1 @@
|
|||
=sys-kernel/genkernel-3.4.52.3
|
1
releases/weekly/portage/cloud-stages/package.use/iputils
Normal file
1
releases/weekly/portage/cloud-stages/package.use/iputils
Normal file
|
@ -0,0 +1 @@
|
|||
net-misc/iputils -caps -filecaps
|
|
@ -0,0 +1 @@
|
|||
=sys-kernel/genkernel-3.4.52.3
|
|
@ -21,7 +21,7 @@ mkdir /boot/grub
|
|||
echo 'GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8"' >> /etc/default/grub
|
||||
grub2-mkconfig -o /boot/grub/grub.cfg
|
||||
sed -r -i 's/loop[0-9]+p1/vda2/g' /boot/grub/grub.cfg
|
||||
sed -i 's/UUID=[a-z,0-9,-]*/\/dev\/vda2/g' /boot/grub/grub.cfg
|
||||
sed -i 's/root=.*\ ro/root=\/dev\/vda2\ ro/' /boot/grub/grub.cfg
|
||||
|
||||
# And the fstab
|
||||
echo '/dev/vda2 / ext4 defaults 0 0' > /etc/fstab
|
||||
|
@ -68,12 +68,6 @@ sed -i '/^USE=\"\${USE}\ \ build\"$/d' /etc/portage/make.conf
|
|||
# clean up system
|
||||
passwd -d root
|
||||
passwd -l root
|
||||
rm -R -f /usr/portage/distfiles/*
|
||||
rm -f /etc/ssh/ssh_host_*
|
||||
rm -f /root/.bash_history
|
||||
rm -f /root/.nano_history
|
||||
rm -f /root/.lesshst
|
||||
rm -f /root/.ssh/known_hosts
|
||||
rm -f /usr/src/linux
|
||||
for i in $(find /var/log -type f); do echo > $i; done
|
||||
for i in $(find /tmp -type f); do rm -f $i; done
|
||||
for i in $(find /var/log -type f); do truncate -s 0 $i; done
|
||||
# remove foreign manpages
|
||||
find /usr/share/man/ -mindepth 1 -maxdepth 1 -path "/usr/share/man/man*" -prune -o -exec rm -rf {} \;
|
||||
|
|
|
@ -51,7 +51,7 @@ livecd/packages:
|
|||
net-misc/rdate
|
||||
# net-misc/vconfig
|
||||
net-proxy/dante
|
||||
net-proxy/ntlmaps
|
||||
# net-proxy/ntlmaps
|
||||
net-proxy/tsocks
|
||||
# net-wireless/ipw2100-firmware
|
||||
# net-wireless/ipw2200-firmware
|
||||
|
|
|
@ -115,7 +115,7 @@ livecd/packages:
|
|||
net-misc/wget
|
||||
net-misc/whois
|
||||
net-proxy/dante
|
||||
net-proxy/ntlmaps
|
||||
# net-proxy/ntlmaps
|
||||
net-proxy/tsocks
|
||||
net-wireless/b43-fwcutter
|
||||
### Masked (~amd64)
|
||||
|
|
|
@ -118,7 +118,7 @@ livecd/packages:
|
|||
net-misc/wget
|
||||
net-misc/whois
|
||||
net-proxy/dante
|
||||
net-proxy/ntlmaps
|
||||
# net-proxy/ntlmaps
|
||||
net-proxy/tsocks
|
||||
net-wireless/b43-fwcutter
|
||||
### Masked (~amd64)
|
||||
|
|
|
@ -52,7 +52,37 @@ stage4/rcadd:
|
|||
syslog-ng|default
|
||||
|
||||
boot/kernel: gentoo
|
||||
boot/kernel/gentoo/sources: gentoo-sources
|
||||
boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/installcd-3.18.12.config
|
||||
boot/kernel/gentoo/sources: hardened-sources
|
||||
boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
|
||||
boot/kernel/gentoo/extraversion: openstack
|
||||
boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
|
||||
|
||||
# all of the cleanup...
|
||||
stage4/unmerge:
|
||||
sys-kernel/genkernel
|
||||
sys-kernel/gentoo-sources
|
||||
|
||||
stage4/empty:
|
||||
/root/.ccache
|
||||
/tmp
|
||||
/usr/portage/distfiles
|
||||
/usr/src
|
||||
/var/cache/edb/dep
|
||||
/var/cache/genkernel
|
||||
/var/empty
|
||||
/var/run
|
||||
/var/state
|
||||
/var/tmp
|
||||
|
||||
stage4/rm:
|
||||
/etc/*-
|
||||
/etc/*.old
|
||||
/etc/ssh/ssh_host_*
|
||||
/root/.*history
|
||||
/root/.lesshst
|
||||
/root/.ssh/known_hosts
|
||||
/root/.viminfo
|
||||
# Remove any generated stuff by genkernel
|
||||
/usr/share/genkernel
|
||||
# This is 3MB of crap for each copy
|
||||
/usr/lib64/python*/site-packages/gentoolkit/test/eclean/testdistfiles.tar.gz
|
||||
|
|
|
@ -52,7 +52,37 @@ stage4/rcadd:
|
|||
syslog-ng|default
|
||||
|
||||
boot/kernel: gentoo
|
||||
boot/kernel/gentoo/sources: gentoo-sources
|
||||
boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/installcd-3.18.12.config
|
||||
boot/kernel/gentoo/sources: hardened-sources
|
||||
boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
|
||||
boot/kernel/gentoo/extraversion: openstack
|
||||
boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
|
||||
|
||||
# all of the cleanup...
|
||||
stage4/unmerge:
|
||||
sys-kernel/genkernel
|
||||
sys-kernel/gentoo-sources
|
||||
|
||||
stage4/empty:
|
||||
/root/.ccache
|
||||
/tmp
|
||||
/usr/portage/distfiles
|
||||
/usr/src
|
||||
/var/cache/edb/dep
|
||||
/var/cache/genkernel
|
||||
/var/empty
|
||||
/var/run
|
||||
/var/state
|
||||
/var/tmp
|
||||
|
||||
stage4/rm:
|
||||
/etc/*-
|
||||
/etc/*.old
|
||||
/etc/ssh/ssh_host_*
|
||||
/root/.*history
|
||||
/root/.lesshst
|
||||
/root/.ssh/known_hosts
|
||||
/root/.viminfo
|
||||
# Remove any generated stuff by genkernel
|
||||
/usr/share/genkernel
|
||||
# This is 3MB of crap for each copy
|
||||
/usr/lib64/python*/site-packages/gentoolkit/test/eclean/testdistfiles.tar.gz
|
||||
|
|
|
@ -56,7 +56,7 @@ livecd/packages:
|
|||
net-misc/rsync
|
||||
net-misc/vconfig
|
||||
net-proxy/dante
|
||||
net-proxy/ntlmaps
|
||||
# net-proxy/ntlmaps
|
||||
net-proxy/tsocks
|
||||
net-wireless/b43-fwcutter
|
||||
### Masked (~keywords)
|
||||
|
|
|
@ -73,7 +73,7 @@ livecd/packages:
|
|||
net-misc/whois
|
||||
net-p2p/bittorrent
|
||||
net-proxy/dante
|
||||
net-proxy/ntlmaps
|
||||
# net-proxy/ntlmaps
|
||||
net-proxy/tsocks
|
||||
net-wireless/b43-fwcutter
|
||||
### Masked (~amd64)
|
||||
|
|
|
@ -167,7 +167,7 @@ livecd/packages:
|
|||
net-p2p/limewire
|
||||
net-print/cups
|
||||
net-proxy/dante
|
||||
net-proxy/ntlmaps
|
||||
# net-proxy/ntlmaps
|
||||
net-proxy/tsocks
|
||||
### Masked (~amd64)
|
||||
# net-wireless/aircrack-ng
|
||||
|
|
|
@ -9,6 +9,7 @@ portage_confdir: /release/releng/releases/weekly/portage/cloud-stages
|
|||
|
||||
stage4/use:
|
||||
bash-completion
|
||||
bindist
|
||||
bzip2
|
||||
idm
|
||||
ipv6
|
||||
|
@ -26,6 +27,7 @@ stage4/packages:
|
|||
app-portage/eix
|
||||
app-portage/gentoolkit
|
||||
net-misc/dhcpcd
|
||||
net-misc/iputils
|
||||
sys-boot/grub
|
||||
sys-apps/dmidecode
|
||||
sys-apps/gptfdisk
|
||||
|
@ -53,6 +55,36 @@ stage4/rcadd:
|
|||
|
||||
boot/kernel: gentoo
|
||||
boot/kernel/gentoo/sources: gentoo-sources
|
||||
boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/installcd-3.18.12.config
|
||||
boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
|
||||
boot/kernel/gentoo/extraversion: openstack
|
||||
boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
|
||||
|
||||
# all of the cleanup...
|
||||
stage4/unmerge:
|
||||
sys-kernel/genkernel
|
||||
sys-kernel/gentoo-sources
|
||||
|
||||
stage4/empty:
|
||||
/root/.ccache
|
||||
/tmp
|
||||
/usr/portage/distfiles
|
||||
/usr/src
|
||||
/var/cache/edb/dep
|
||||
/var/cache/genkernel
|
||||
/var/empty
|
||||
/var/run
|
||||
/var/state
|
||||
/var/tmp
|
||||
|
||||
stage4/rm:
|
||||
/etc/*-
|
||||
/etc/*.old
|
||||
/etc/ssh/ssh_host_*
|
||||
/root/.*history
|
||||
/root/.lesshst
|
||||
/root/.ssh/known_hosts
|
||||
/root/.viminfo
|
||||
# Remove any generated stuff by genkernel
|
||||
/usr/share/genkernel
|
||||
# This is 3MB of crap for each copy
|
||||
/usr/lib64/python*/site-packages/gentoolkit/test/eclean/testdistfiles.tar.gz
|
||||
|
|
|
@ -53,6 +53,36 @@ stage4/rcadd:
|
|||
|
||||
boot/kernel: gentoo
|
||||
boot/kernel/gentoo/sources: gentoo-sources
|
||||
boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/installcd-3.18.12.config
|
||||
boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
|
||||
boot/kernel/gentoo/extraversion: openstack
|
||||
boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
|
||||
|
||||
# all of the cleanup...
|
||||
stage4/unmerge:
|
||||
sys-kernel/genkernel
|
||||
sys-kernel/gentoo-sources
|
||||
|
||||
stage4/empty:
|
||||
/root/.ccache
|
||||
/tmp
|
||||
/usr/portage/distfiles
|
||||
/usr/src
|
||||
/var/cache/edb/dep
|
||||
/var/cache/genkernel
|
||||
/var/empty
|
||||
/var/run
|
||||
/var/state
|
||||
/var/tmp
|
||||
|
||||
stage4/rm:
|
||||
/etc/*-
|
||||
/etc/*.old
|
||||
/etc/ssh/ssh_host_*
|
||||
/root/.*history
|
||||
/root/.lesshst
|
||||
/root/.ssh/known_hosts
|
||||
/root/.viminfo
|
||||
# Remove any generated stuff by genkernel
|
||||
/usr/share/genkernel
|
||||
# This is 3MB of crap for each copy
|
||||
/usr/lib64/python*/site-packages/gentoolkit/test/eclean/testdistfiles.tar.gz
|
||||
|
|
|
@ -48,7 +48,7 @@ livecd/packages:
|
|||
net-misc/rdate
|
||||
net-misc/vconfig
|
||||
net-proxy/dante
|
||||
net-proxy/ntlmaps
|
||||
# net-proxy/ntlmaps
|
||||
sys-apps/ethtool
|
||||
sys-apps/hdparm
|
||||
sys-apps/hwsetup
|
||||
|
|
|
@ -110,7 +110,7 @@ livecd/unmerge:
|
|||
dev-util/pkgconfig
|
||||
net-misc/netifrc
|
||||
net-misc/rsync
|
||||
net-proxy/ntlmaps
|
||||
# net-proxy/ntlmaps
|
||||
perl-core/PodParser
|
||||
perl-core/Test-Harness
|
||||
sys-apps/debianutils
|
||||
|
|
|
@ -49,7 +49,7 @@ livecd/packages:
|
|||
net-misc/rdate
|
||||
# net-misc/vconfig
|
||||
net-proxy/dante
|
||||
net-proxy/ntlmaps
|
||||
# net-proxy/ntlmaps
|
||||
# Not keyworded
|
||||
# net-proxy/tsocks
|
||||
# net-wireless/ipw2100-firmware
|
||||
|
|
|
@ -53,7 +53,7 @@ livecd/packages:
|
|||
net-misc/iputils
|
||||
net-misc/ntp
|
||||
net-misc/rdate
|
||||
net-proxy/ntlmaps
|
||||
# net-proxy/ntlmaps
|
||||
net-wireless/b43-fwcutter
|
||||
net-wireless/bcm43xx-fwcutter
|
||||
net-wireless/wireless-tools
|
||||
|
|
|
@ -22,6 +22,7 @@ netboot2/use:
|
|||
shadow
|
||||
readline
|
||||
ssl
|
||||
unicode
|
||||
|
||||
netboot2/packages:
|
||||
sys-apps/s390-tools
|
||||
|
|
|
@ -22,6 +22,7 @@ netboot2/use:
|
|||
shadow
|
||||
readline
|
||||
ssl
|
||||
unicode
|
||||
|
||||
netboot2/packages:
|
||||
sys-apps/s390-tools
|
||||
|
|
|
@ -57,7 +57,7 @@ livecd/packages:
|
|||
net-misc/vconfig
|
||||
net-proxy/dante
|
||||
# Not keyworded
|
||||
# net-proxy/ntlmaps
|
||||
## net-proxy/ntlmaps
|
||||
net-proxy/tsocks
|
||||
# net-wireless/ipw2100-firmware
|
||||
# net-wireless/ipw2200-firmware
|
||||
|
|
|
@ -118,7 +118,7 @@ livecd/packages:
|
|||
net-misc/wget
|
||||
net-misc/whois
|
||||
net-proxy/dante
|
||||
net-proxy/ntlmaps
|
||||
# net-proxy/ntlmaps
|
||||
net-proxy/tsocks
|
||||
net-wireless/b43-fwcutter
|
||||
### Masked (~amd64)
|
||||
|
|
|
@ -50,7 +50,7 @@ livecd/packages:
|
|||
net-misc/rdate
|
||||
net-misc/vconfig
|
||||
net-proxy/dante
|
||||
net-proxy/ntlmaps
|
||||
# net-proxy/ntlmaps
|
||||
net-proxy/tsocks
|
||||
net-wireless/ipw2100-firmware
|
||||
net-wireless/ipw2200-firmware
|
||||
|
|
|
@ -72,7 +72,7 @@ livecd/packages:
|
|||
net-misc/whois
|
||||
net-p2p/bittorrent
|
||||
net-proxy/dante
|
||||
net-proxy/ntlmaps
|
||||
# net-proxy/ntlmaps
|
||||
net-proxy/tsocks
|
||||
### Masked by ~x86
|
||||
# net-wireless/b43-fwcutter
|
||||
|
|
|
@ -161,7 +161,7 @@ livecd/packages:
|
|||
net-p2p/limewire
|
||||
net-print/cups
|
||||
net-proxy/dante
|
||||
net-proxy/ntlmaps
|
||||
# net-proxy/ntlmaps
|
||||
net-proxy/tsocks
|
||||
net-wireless/aircrack-ng
|
||||
net-wireless/airsnort
|
||||
|
|
|
@ -54,7 +54,7 @@ livecd/packages:
|
|||
net-misc/rsync
|
||||
net-misc/vconfig
|
||||
net-proxy/dante
|
||||
net-proxy/ntlmaps
|
||||
# net-proxy/ntlmaps
|
||||
net-proxy/tsocks
|
||||
net-wireless/b43-fwcutter
|
||||
### Masked (~keywords)
|
||||
|
|
Loading…
Add table
Reference in a new issue