Gentoo
/
unitas
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

virtual-appliance: stable release 0.9.1

This commit is contained in:
Jörg Deckert 2015-03-04 15:23:57 +01:00
parent 35fc439d09
commit 45cbd9092f
4 changed files with 86 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app-portage/virtual-appliance/Manifest
View File

@ -1,4 +1,4 @@
AUX hardened.diff 5341 SHA256 190e5b6f5ab5e776daf9986d93d9a86264292a4783e70c7b7acbcec808e99cc7 SHA512 4f8999ede71d3731f3b6175a96e9136907faae3fa97efa1fcd701945c2db98c21b5bd2c16928352629822ad8c3269659638f7e8bc6394432101f57be3a4d7ad3 WHIRLPOOL d757da6bb3593c1156736045b286a23d5d9029f9a1961a997ba09d184f176af89d5331431afb38753d086768771cf622fd30b71105d500d367ddc5c1750f7e53
AUX varconfpath.diff 479 SHA256 a0ea9b4913ff77bce859b18c2643885f9e146ff80328e4e57dfa45556c47d243 SHA512 d463f21b4efcf8ec097dfee32864b1bd84c5cf4e2626587c97cebf8849978b0410718cf1fdd612536bdea9ee579fa3353885b0c12075acbac58c33cd65fb919b WHIRLPOOL af33ba687ffe829117b25b1b53a703a2eb599f5957782229937fed56fbf9618984afe1a63bf0378f9aea962f52588ca05e82e5082aea4eb9f921ccb89c162b9c
DIST marduk-virtual-appliance-aa58756d5178.tar.bz2 48941 SHA256 72fd95203a6cacb4c25e12c8a1cd89d1ae4cfa4ae8eeb616cd3f92b2a2eb1294 SHA512 8625c6f2cccdcd04446c1998b4e640ee1d3e35b7eb244524c8ff8cba80ae8d5ff62be780fa82016d092ae2ff099e3ee8dd020b0ab2aed99fbff1c99cfc89c2de WHIRLPOOL b15ae7fcb33f9ad855a7a39b4abf7cec2d65057e6349dee7710eafa4c1c4b102273c95e600f567297c8ae6c579851788f88f33711d3d8d8c0c779371e969e0df
EBUILD virtual-appliance-20140911.ebuild 1054 SHA256 8f9bc5322d2c5cc480548a1a3b73d52e1f9d23bbc59243fdf1f01b52cfda8b3c SHA512 9aaaf338e05c1624c8d39780028a94ee0fdeb7ce1141da475e3730f980c0c9540ce855eb7a8226015a9671aec402b6f15e093cb8c17e3f0a2fb283951359ebbd WHIRLPOOL 889fae12daa599b962b2ecc90497fbb474a1ce1185597ee7fb2c9e748a3ed2a5fd8b6363cc41f7bff8b86a7245c25469ad2c56cb5b0ee01f17f475a691061a90
AUX addparams-0.9.1.diff 6756 SHA256 d384ef312af31c3bb16e71d27a3b6f1c5d36fefe393d7b941f4e6013a7b8b218 SHA512 36bc53c0037a56f111c9ce29eb457555246936058845f71d24ec3bdd97d245006dc21cd332b8bd8de1fbda82962806473362c493ac4e7215b429860cc26220a4 WHIRLPOOL ef659270ad2c339e6bd92aeedc69f99fdaaa1c1bdc526a526f0b4320f81de6ef146ec1943514749fa6dc56a2502200117bd4d4a07abdb0b47ee73ca170daa0c3
AUX varconfpath-0.9.1.diff 409 SHA256 49cde0194d2a22f5b661c28158babed8e5b576df1804bde5a4028e190fa1614d SHA512 2c6118269e9a08cd0533989a57b036977ca6c2579aae2904790645efa95ec87ee9c7affe3b961159a652756122f92b04a1ef9d34b6a55e1e35902f39e8be487e WHIRLPOOL 69b0c3c92aea233405bda4c49a3b418adcb422b571181fc831388e11f6b2186be1c2c84fb4fdc30f5464d13eab592a1db6c7663f8fe7517790a3759505ec981a
DIST virtual-appliance-0.9.1.tar.bz2 49846 SHA256 f0a78d83f3e0e772d5a296b50b2fee93fb7f8271509b12fbc610d736a4710f73 SHA512 1db8eac5b80bde25842b612f077c40b5e8a9631294ca80a5cf663ed1023f5cd70b57a56801c627120f0915402eef6ce8bf7d92126550ce39f3bde5c6925cba99 WHIRLPOOL 5a7cfef86e698e88e9636280d0debae415f2d2d5947837b8af825a1913ae415ddecc2b7269db12914c119a122f02364c0bbb81b9acba37e24c77fe806970f953
EBUILD virtual-appliance-0.9.1.ebuild 1062 SHA256 229e607d1e9256ac698cde814ace83130828a9ca9f7cf9a2c9ff829ff8e5effd SHA512 28bf6b5d00d2c2f0df1e81fd318bee825fafcd11a0ff7a87a468f245b8917b4fb635c71fedb6ef642fc3b3fb0194e0d80ae11ee73cca61f2c427335fc254990d WHIRLPOOL 9a728ed7fc42038d516119eefafe77645c5ad6a677b77c2bc8ea1d8333e601324820180c2e436f843363d29c45c1f9cea338af0ee6abba33d132b33217f6c27c

94
app-portage/virtual-appliance/files/hardened.diff → app-portage/virtual-appliance/files/addparams-0.9.1.diff
View File

@ -1,12 +1,34 @@
diff -Naur virtual-appliance.orig/configs/locale.gen virtual-appliance/configs/locale.gen
--- virtual-appliance.orig/configs/locale.gen 2015-03-01 12:45:06.000000000 +0100
+++ virtual-appliance/configs/locale.gen 2014-09-23 10:34:00.000000000 +0200
@@ -17,15 +17,6 @@
en_US ISO-8859-1
en_US.UTF-8 UTF-8
-#ja_JP.EUC-JP EUC-JP
-#ja_JP.UTF-8 UTF-8
-#ja_JP EUC-JP
-#en_HK ISO-8859-1
-#en_PH ISO-8859-1
-#de_DE ISO-8859-1
-#de_DE@euro ISO-8859-15
-#es_MX ISO-8859-1
-#fa_IR UTF-8
-#fr_FR ISO-8859-1
-#fr_FR@euro ISO-8859-15
-#it_IT ISO-8859-1
+de_DE ISO-8859-1
+de_DE@euro ISO-8859-15
+de_DE.UTF-8 UTF-8
diff -Naur virtual-appliance.orig/configs/make.conf.amd64-hardened virtual-appliance/configs/make.conf.amd64-hardened
--- virtual-appliance.orig/configs/make.conf.amd64-hardened 1970-01-01 01:00:00.000000000 +0100
+++ virtual-appliance/configs/make.conf.amd64-hardened 2014-09-26 09:44:30.000000000 +0200
+++ virtual-appliance/configs/make.conf.amd64-hardened 2015-03-03 15:54:23.205110169 +0100
@@ -0,0 +1,14 @@
+CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
+CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
+CHOST="x86_64-pc-linux-gnu"
+MAKEOPTS="-j2"
+USE="-* berkdb gdbm hardened nls nptl open_perms pam pcre peer_perms ubac unconfined unicode xattr zlib ptpax xtpax"
+USE="-* berkdb bindist gdbm hardened nls nptl open_perms pam pcre peer_perms ubac unconfined unicode xattr zlib ptpax xtpax"
+ALSA_PCM_PLUGINS="*"
+CLEAN_DELAY="0"
+EMERGE_WARNING_DELAY="0"
@ -15,10 +37,10 @@ diff -Naur virtual-appliance.orig/configs/make.conf.amd64-hardened virtual-appli
+EMERGE_DEFAULT_OPTS="--jobs=2 --autounmask=n"
+FEATURES="noinfo -test nodoc noman nostrip unmerge-orphans buildpkg notitles parallel-fetch -selinux -sesandbox"
+CURL_SSL="openssl"
+PYTHON_TARGETS="python2_7 python3_3"
+PYTHON_TARGETS="python2_7 python3_4"
diff -Naur virtual-appliance.orig/Makefile virtual-appliance/Makefile
--- virtual-appliance.orig/Makefile 2014-09-26 10:48:54.721491795 +0200
+++ virtual-appliance/Makefile 2014-09-24 09:41:19.000000000 +0200
--- virtual-appliance.orig/Makefile 2015-03-03 15:11:48.549069120 +0100
+++ virtual-appliance/Makefile 2015-03-03 16:00:36.172702376 +0100
@@ -22,6 +22,9 @@
HEADLESS = NO
EXTERNAL_KERNEL = NO
@ -29,18 +51,7 @@ diff -Naur virtual-appliance.orig/Makefile virtual-appliance/Makefile
SOFTWARE = 1
PKGLIST = 0
ACCEPT_KEYWORDS = amd64
@@ -149,8 +152,8 @@
@exit 1
sync_stage3:
- rsync --no-motd $(RSYNC_MIRROR)/releases/`echo $(ARCH)|sed 's/i.86/x86/'`/autobuilds/latest-stage3.txt latest-stage3.txt
- rsync --no-motd $(RSYNC_MIRROR)/releases/$(ARCH)/autobuilds/$$(grep stage3-$$(echo $(ARCH)|sed 's/x86/i686/')-[0-9]*\.tar\.bz2 latest-stage3.txt) stage3-$(ARCH)-latest.tar.bz2
+ rsync --no-motd $(RSYNC_MIRROR)/releases/`echo $(ARCH)|sed 's/-hardened//'|sed 's/i.86/x86/'`/autobuilds/latest-stage3.txt latest-stage3.txt
+ rsync --no-motd $(RSYNC_MIRROR)/releases/`echo $(ARCH)|sed 's/-hardened//'`/autobuilds/$$(grep stage3-$$(echo $(ARCH)|sed 's/x86/i686/')-[0-9]*\.tar\.bz2 latest-stage3.txt) stage3-$(ARCH)-latest.tar.bz2
stage3: stage3-$(ARCH)-latest.tar.bz2
@@ -171,7 +174,7 @@
@@ -170,7 +173,7 @@
endif
echo ACCEPT_KEYWORDS=$(ACCEPT_KEYWORDS) >> $(CHROOT)/etc/portage/make.conf
-[ -f "appliances/$(APPLIANCE)/make.conf" ] && cat "appliances/$(APPLIANCE)/make.conf" >> $(CHROOT)/etc/portage/make.conf
@ -48,7 +59,7 @@ diff -Naur virtual-appliance.orig/Makefile virtual-appliance/Makefile
+ $(inroot) eselect profile set $(PROFILE)
cp configs/locale.gen $(CHROOT)/etc/locale.gen
$(inroot) locale-gen
mkdir -p $(CHROOT)/etc/portage
for f in $(PACKAGE_FILES); do \
@@ -228,8 +231,8 @@
systools: sysconfig compile_options
@ -75,7 +86,27 @@ diff -Naur virtual-appliance.orig/Makefile virtual-appliance/Makefile
touch systools
grub: stage3 configs/grub.conf kernel scripts/grub-headless.sed
@@ -413,13 +424,17 @@
@@ -274,7 +285,11 @@
$(inroot) $(EMERGE) $(USEPKG) --update --newuse --deep world
$(inroot) $(EMERGE) --depclean --with-bdeps=n
$(gcc_config)
+ifdef ETC_UPDATE_AUTO
+ EDITOR=/usr/bin/nano $(inroot) etc-update --automode $(ETC_UPDATE_AUTO)
+else
EDITOR=/usr/bin/nano $(inroot) etc-update
+endif
$(MAKE) -C appliances/$(APPLIANCE) postinstall
ifeq ($(UDEV),NO)
rm -f $(CHROOT)/etc/runlevels/sysinit/udev
@@ -348,6 +363,7 @@
mount -o bind $(CHROOT) gentoo
tar -aScf "$(STAGE4_TARBALL).tmp.xz" --numeric-owner $(COPY_ARGS) -C gentoo --one-file-system .
umount gentoo
+ sleep 5
rmdir gentoo
mv "$(STAGE4_TARBALL).tmp.xz" "$(STAGE4_TARBALL)"
@@ -413,13 +429,18 @@
@echo 'CHROOT= - The directory to build the chroot'
@echo 'DISK_SIZE= - Size of the disk image'
@echo 'SWAP_SIZE= - Size of the swap file'
@ -91,12 +122,13 @@ diff -Naur virtual-appliance.orig/Makefile virtual-appliance/Makefile
+ @echo 'LOGGER=metalog - Logging daemon (metalog, syslog-ng)'
+ @echo 'PROFILE=1 - select profile'
+ @echo 'SELINUX=NO - enable SELinux'
+ @echo 'ETC_UPDATE_AUTO = - automatic etc-update (e.g. -7: do not ask)'
@echo
@scripts/echo 'Example'
@echo 'make APPLIANCE=mongodb HEADLESS=YES VIRTIO=YES stage4 qcow clean'
diff -Naur virtual-appliance.orig/scripts/kernel.sh virtual-appliance/scripts/kernel.sh
--- virtual-appliance.orig/scripts/kernel.sh 2014-09-11 15:11:09.000000000 +0200
+++ virtual-appliance/scripts/kernel.sh 2014-09-26 09:25:08.000000000 +0200
--- virtual-appliance.orig/scripts/kernel.sh 2015-03-01 12:45:06.000000000 +0100
+++ virtual-appliance/scripts/kernel.sh 2015-03-03 15:12:29.900967930 +0100
@@ -24,7 +24,7 @@
make ${MAKEOPTS} oldconfig
make ${MAKEOPTS}
@ -106,3 +138,23 @@ diff -Naur virtual-appliance.orig/scripts/kernel.sh virtual-appliance/scripts/ke
rm -f /boot/vmlinuz*
make ${MAKEOPTS} install
cp -a /usr/src/linux/.config /root/kernel.config
diff -Naur virtual-appliance.orig/scripts/sync-stage3.sh virtual-appliance/scripts/sync-stage3.sh
--- virtual-appliance.orig/scripts/sync-stage3.sh 2015-03-01 12:45:06.000000000 +0100
+++ virtual-appliance/scripts/sync-stage3.sh 2015-03-03 15:12:29.900967930 +0100
@@ -3,14 +3,14 @@
set -e
RSYNC_MIRROR=${RSYNC_MIRROR:-rsync://mirrors.rit.edu/gentoo/}
arch=$1
-g_arch=$(echo ${arch}|sed 's/i.86/x86/')
+g_arch=$(echo ${arch}|sed 's/i.86/x86/'|sed 's/-hardened//')
rsync="rsync --no-motd"
echo -n ${arch}:
latest=/releases/${g_arch}/autobuilds/latest-stage3.txt
${rsync} ${RSYNC_MIRROR}${latest} latest-stage3.txt
-file=$(egrep -v 'nomultilib|hardened|uclibc|^#' latest-stage3.txt \
+file=$(cat latest-stage3.txt \
| grep -E ${arch}\|i686 |head -n 1 \
| cut -d ' ' -f 1)

5
app-portage/virtual-appliance/files/varconfpath.diff → app-portage/virtual-appliance/files/varconfpath-0.9.1.diff
View File

@ -1,6 +1,5 @@
diff -Naur virtual-appliance.orig/Makefile virtual-appliance/Makefile
--- virtual-appliance.orig/Makefile 2014-09-11 15:11:09.000000000 +0200
+++ virtual-appliance/Makefile 2014-09-19 11:16:00.614382539 +0200
--- virtual-appliance.orig/Makefile 2015-03-01 12:45:06.000000000 +0100
+++ virtual-appliance/Makefile 2015-03-02 10:23:39.075189065 +0100
@@ -41,7 +41,7 @@
CRITICAL = appliances/$(APPLIANCE)/critical

13
app-portage/virtual-appliance/virtual-appliance-20140911.ebuild → app-portage/virtual-appliance/virtual-appliance-0.9.1.ebuild
View File

@ -1,19 +1,19 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=4
EAPI=5
inherit eutils linux-info toolchain-funcs
MY_REV="aa58756d5178" # checkout revision
MY_REV="82ab42046c48" # checkout revision
MY_USR="marduk" # user name
MY_P="${MY_USR}-${PN}-${MY_REV}"
DESCRIPTION="Programatically (re)create Gentoo Virtual Appliances"
HOMEPAGE="https://bitbucket.org/marduk/virtual-appliance/wiki/Home"
SRC_URI="https://bitbucket.org/${MY_USR}/${PN}/get/${MY_REV}.tar.bz2 -> ${MY_P}.tar.bz2"
SRC_URI="https://bitbucket.org/${MY_USR}/${PN}/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
LICENSE="unknown"
SLOT="0"
@ -34,8 +34,9 @@ pkg_setup() {
src_prepare() {
rm .hg_archival.txt
rm .hgignore
epatch ${FILESDIR}/varconfpath.diff
epatch ${FILESDIR}/hardened.diff
rm .hgtags
epatch ${FILESDIR}/varconfpath-${PV}.diff
epatch ${FILESDIR}/addparams-${PV}.diff
}
src_compile() {