VA
/
virtual-appliance
1
0
Fork 0
Code Issues Pull Requests Releases 6 Wiki Activity

Merge heads.

This commit is contained in:
Albert Hopkins 2013-09-01 19:44:20 +00:00
parent ce10b3ea2a 1e7b1ad23b
commit 010aecbee0
19 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Makefile
View File

@ -136,9 +136,11 @@ ifdef PKGDIR
endif endif
touch portage touch portage
preproot: stage3 mounts portage preproot: stage3 mounts portage fstab
cp -L /etc/resolv.conf $(CHROOT)/etc/ cp -L /etc/resolv.conf $(CHROOT)/etc/
$(inroot) sed -i 's/root:.*/root::9797:0:::::/' /etc/shadow $(inroot) sed -i 's/root:.*/root::9797:0:::::/' /etc/shadow
cp fstab $(CHROOT)/etc/fstab
echo hostname=\"$(HOSTNAME)\" > $(CHROOT)/etc/conf.d/hostname
touch preproot touch preproot
stage3-$(ARCH)-latest.tar.bz2: stage3-$(ARCH)-latest.tar.bz2:
@ -194,15 +196,13 @@ endif
touch kernel touch kernel
$(SWAP_FILE): preproot $(SWAP_FILE): preproot
ifneq ($(SWAP_SIZE),0)
@./echo Creating swap file: $(SWAP_FILE) @./echo Creating swap file: $(SWAP_FILE)
dd if=/dev/zero of=$(SWAP_FILE) bs=1M count=$(SWAP_SIZE) dd if=/dev/zero of=$(SWAP_FILE) bs=1M count=$(SWAP_SIZE)
/sbin/mkswap $(SWAP_FILE) /sbin/mkswap $(SWAP_FILE)
else
$(CHROOT)/etc/fstab: fstab preproot sed -i '/swap/d' $(CHROOT)/etc/fstab
cp fstab $(CHROOT)/etc/fstab endif
$(CHROOT)/etc/conf.d/hostname: preproot
echo hostname=\"$(HOSTNAME)\" > $(CHROOT)/etc/conf.d/hostname
sysconfig: preproot acpi.start $(SWAP_FILE) $(CHROOT)/etc/fstab $(CHROOT)/etc/conf.d/hostname sysconfig: preproot acpi.start $(SWAP_FILE) $(CHROOT)/etc/fstab $(CHROOT)/etc/conf.d/hostname
@echo $(VIRTIO) @echo $(VIRTIO)
@ -278,6 +278,12 @@ build-software: systools issue etc-update.conf $(CRITICAL) $(WORLD)
$(gcc_config) $(gcc_config)
EDITOR=/usr/bin/nano $(inroot) etc-update EDITOR=/usr/bin/nano $(inroot) etc-update
$(MAKE) -C $(APPLIANCE) postinstall $(MAKE) -C $(APPLIANCE) postinstall
ifeq ($(UDEV),NO)
rm -f $(CHROOT)/etc/runlevels/sysinit/udev
$(inroot) $(EMERGE) -c sys-fs/udev
else
ln -sf /etc/init.d/udev $(CHROOT)/etc/runlevels/sysinit/udev
endif
ifeq ($(ENABLE_SSHD),YES) ifeq ($(ENABLE_SSHD),YES)
$(inroot) /sbin/rc-update add sshd default $(inroot) /sbin/rc-update add sshd default
endif endif
@ -302,7 +308,7 @@ endif
device-map: $(RAW_IMAGE) device-map: $(RAW_IMAGE)
echo '(hd0) ' $(RAW_IMAGE) > device-map echo '(hd0) ' $(RAW_IMAGE) > device-map
image: $(STAGE4_TARBALL) partitions device-map grub.shell dev.tar.bz2 motd.sh image: $(STAGE4_TARBALL) partitions device-map grub.shell motd.sh
@./echo Installing files to $(RAW_IMAGE) @./echo Installing files to $(RAW_IMAGE)
mkdir -p loop mkdir -p loop
mount -o noatime $(NBD_DEV)p1 loop mount -o noatime $(NBD_DEV)p1 loop
@ -310,12 +316,6 @@ image: $(STAGE4_TARBALL) partitions device-map grub.shell dev.tar.bz2 motd.sh
./motd.sh $(EXTERNAL_KERNEL) $(VIRTIO) $(DISK_SIZE) $(SWAP_SIZE) $(UDEV) $(DASH) $(ARCH) > loop/etc/motd ./motd.sh $(EXTERNAL_KERNEL) $(VIRTIO) $(DISK_SIZE) $(SWAP_SIZE) $(UDEV) $(DASH) $(ARCH) > loop/etc/motd
ifneq ($(EXTERNAL_KERNEL),YES) ifneq ($(EXTERNAL_KERNEL),YES)
loop/sbin/grub --device-map=device-map --no-floppy --batch < grub.shell loop/sbin/grub --device-map=device-map --no-floppy --batch < grub.shell
endif
ifeq ($(UDEV),NO)
tar jxf dev.tar.bz2 -C loop/dev
rm -f loop/etc/runlevels/sysinit/udev
else
ln -sf /etc/init.d/udev loop/etc/runlevels/sysinit/udev
endif endif
umount -l loop umount -l loop
rmdir loop rmdir loop
@ -358,11 +358,11 @@ $(STAGE4_TARBALL):
umount: umount:
@./echo Attempting to unmount chroot mounts @./echo Attempting to unmount chroot mounts
ifdef PKGDIR ifdef PKGDIR
umount $(CHROOT)/var/portage/packages umount -l $(CHROOT)/var/portage/packages
endif endif
umount $(CHROOT)/var/tmp umount -l $(CHROOT)/var/tmp
umount $(CHROOT)/dev umount -l $(CHROOT)/dev
umount $(CHROOT)/proc umount -l $(CHROOT)/proc
touch umount touch umount
remove_checkpoints: remove_checkpoints:

BIN
dev.tar.bz2
View File

Binary file not shown.

1
gnome/package.use
View File

@ -1,6 +1,7 @@
app-editors/nano ncurses app-editors/nano ncurses
dev-lang/python ssl sqlite threads xml dev-lang/python ssl sqlite threads xml
sys-apps/kmod tools sys-apps/kmod tools
sys-apps/portage python3 ipc
sys-devel/gcc cxx nptl sys-devel/gcc cxx nptl
sys-kernel/gentoo-sources symlink sys-kernel/gentoo-sources symlink
sys-libs/ncurses minimal sys-libs/ncurses minimal

2
issue
View File

@ -1,6 +1,6 @@
 
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
Gentoo Virtual Machine Gentoo Virtual Appliance
------------------------------------------------------------------------------ ------------------------------------------------------------------------------

2
mongodb/Makefile
View File

@ -1,4 +1,6 @@
preinstall: preinstall:
# v8 needs python2.[67] to build but portage doesn't pull it in
$(inroot) $(EMERGE) -1n $(USEPKG) dev-lang/python:2.7
postinstall: postinstall:
sed -i 's/^MONGODB_IP=.*/MONGODB_IP="0.0.0.0"/' "$(CHROOT)"/etc/conf.d/mongodb sed -i 's/^MONGODB_IP=.*/MONGODB_IP="0.0.0.0"/' "$(CHROOT)"/etc/conf.d/mongodb

1
mongodb/package.use
View File

@ -5,6 +5,7 @@ dev-libs/boost threads
dev-libs/libpcre cxx dev-libs/libpcre cxx
net-misc/dhcp client net-misc/dhcp client
sys-apps/kmod tools sys-apps/kmod tools
sys-apps/portage python3 ipc
sys-devel/gcc cxx nptl sys-devel/gcc cxx nptl
sys-kernel/gentoo-sources symlink sys-kernel/gentoo-sources symlink
sys-libs/ncurses minimal sys-libs/ncurses minimal

1
owncloud/Makefile
View File

@ -3,6 +3,7 @@ preinstall:
postinstall: postinstall:
sed -i 's/^APACHE2_OPTS=.*/APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D PHP5 -D SSL -D SSL_DEFAULT_VHOST"/' $(CHROOT)/etc/conf.d/apache2 sed -i 's/^APACHE2_OPTS=.*/APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D PHP5 -D SSL -D SSL_DEFAULT_VHOST"/' $(CHROOT)/etc/conf.d/apache2
$(inroot) rc-update add apache2 default $(inroot) rc-update add apache2 default
sed -i 's|"/var/www/localhost/htdocs"|"/var/www/localhost/htdocs/owncloud"|g' $(CHROOT)/etc/apache2/vhosts.d/default_vhost.include
clean: clean:

2
owncloud/make.conf
View File

@ -1,3 +1,5 @@
# Settings for owncloud # Settings for owncloud
APACHE2_MODULES="mime alias auth_basic authz_host dir env include info" APACHE2_MODULES="mime alias auth_basic authz_host dir env include info"
PYTHON_TARGETS="$PYTHON_TARGETS python3_2"

1
owncloud/package.keywords
View File

@ -1,2 +1,3 @@
sys-kernel/gentoo-sources ~amd64 ~x86 sys-kernel/gentoo-sources ~amd64 ~x86
www-apps/owncloud ** www-apps/owncloud **
app-admin/webapp-config ~amd64 ~x86

1
owncloud/package.use
View File

@ -5,6 +5,7 @@ sys-apps/kmod tools
sys-devel/gcc cxx nptl sys-devel/gcc cxx nptl
sys-kernel/gentoo-sources symlink sys-kernel/gentoo-sources symlink
sys-libs/ncurses minimal sys-libs/ncurses minimal
sys-apps/portage python3 ipc
app-admin/eselect-php apache2 fpm app-admin/eselect-php apache2 fpm
dev-lang/php apache2 cgi ctype curl fileinfo filter force-cgi-redirect fpm gd hash iconv json mhash pdo session simplexml sqlite truetype xml xmlreader xmlwriter zip zlib dev-lang/php apache2 cgi ctype curl fileinfo filter force-cgi-redirect fpm gd hash iconv json mhash pdo session simplexml sqlite truetype xml xmlreader xmlwriter zip zlib

2
teamplayer/make.conf
View File

@ -1,5 +1,5 @@
# Settings for TeamPlayer # Settings for TeamPlayer
PYTHON_TARGETS="python2_7" PYTHON_TARGETS="python2_7 python3_3"
PYTHON_SINGLE_TARGET="python2_7" PYTHON_SINGLE_TARGET="python2_7"
USE_PYTHON="2.7" USE_PYTHON="2.7"

1
teamplayer/package.use
View File

@ -5,6 +5,7 @@ media-libs/flac ogg
media-sound/mpd aac audiofile ffmpeg flac inotify id3tag lame network ogg vorbis mad sqlite media-sound/mpd aac audiofile ffmpeg flac inotify id3tag lame network ogg vorbis mad sqlite
media-video/ffmpeg mmx mxext mp3 network x264 media-video/ffmpeg mmx mxext mp3 network x264
sys-apps/kmod tools sys-apps/kmod tools
sys-apps/portage python3 ipc
sys-devel/gcc cxx nptl sys-devel/gcc cxx nptl
sys-kernel/gentoo-sources symlink sys-kernel/gentoo-sources symlink
sys-libs/ncurses minimal sys-libs/ncurses minimal

4
x/Makefile
View File

@ -2,9 +2,9 @@ xdm_files = $(wildcard xdm/*)
preinstall: preinstall:
postinstall: $(xdm_files) postinstall: $(xdm_files) xdm.start
cp xdm/* "$(CHROOT)"/etc/X11/xdm cp xdm/* "$(CHROOT)"/etc/X11/xdm
ln -sf /etc/init.d/xdm "$(CHROOT)/etc/runlevels/default/xdm" cp xdm.start "$(CHROOT)"/etc/local.d
clean: clean:

5
x/make.conf
View File

@ -1 +1,4 @@
PYTHON_SINGLE_TARGET="python2_7" PYTHON_TARGETS="python3_2"
PYTHON_SINGLE_TARGET="python3_2"
VIDEO_CARDS=""
INPUT_DEVICES=""

2
x/package.use
View File

@ -3,4 +3,4 @@ dev-libs/libxml2 python
sys-apps/kmod tools sys-apps/kmod tools
sys-devel/gcc cxx nptl sys-devel/gcc cxx nptl
sys-libs/ncurses minimal sys-libs/ncurses minimal
x11-base/xorg-server xorg nptl x11-base/xorg-server minimal xorg nptl

12
x/world
View File

@ -4,35 +4,23 @@ x11-apps/xedit
x11-apps/xeyes x11-apps/xeyes
x11-apps/xload x11-apps/xload
x11-apps/xlogo x11-apps/xlogo
x11-apps/appres
x11-apps/bitmap
x11-apps/iceauth x11-apps/iceauth
x11-apps/luit
x11-apps/mkfontdir x11-apps/mkfontdir
x11-apps/mkfontscale x11-apps/mkfontscale
x11-apps/sessreg x11-apps/sessreg
x11-apps/setxkbmap x11-apps/setxkbmap
x11-apps/smproxy
x11-apps/x11perf
x11-apps/xauth x11-apps/xauth
x11-apps/xbacklight x11-apps/xbacklight
x11-apps/xcmsdb
x11-apps/xcursorgen
x11-apps/xdpyinfo x11-apps/xdpyinfo
x11-apps/xdriinfo
x11-apps/xev x11-apps/xev
x11-apps/xf86dga
x11-apps/xgamma x11-apps/xgamma
x11-apps/xhost x11-apps/xhost
x11-apps/xinput x11-apps/xinput
x11-apps/xkbcomp x11-apps/xkbcomp
x11-apps/xkbevd
x11-apps/xkbutils
x11-apps/xkill x11-apps/xkill
x11-apps/xlsatoms x11-apps/xlsatoms
x11-apps/xlsclients x11-apps/xlsclients
x11-apps/xmodmap x11-apps/xmodmap
x11-apps/xpr
x11-apps/xprop x11-apps/xprop
x11-apps/xrandr x11-apps/xrandr
x11-apps/xrdb x11-apps/xrdb

4
x/xdm.start Executable file
View File

@ -0,0 +1,4 @@
#!/bin/sh
xdm

2
xfce/make.conf
View File

@ -1,2 +1,4 @@
USE="$USE gtk3" USE="$USE gtk3"
PYTHON_TARGETS="python3_2 python2_7"
USE_PYTHON="3.2"
PYTHON_SINGLE_TARGET="python2_7" PYTHON_SINGLE_TARGET="python2_7"

1
xfce/package.use
View File

@ -6,6 +6,7 @@ media-libs/libpng apng
media-libs/libvpx threads media-libs/libvpx threads
net-misc/dhcp client net-misc/dhcp client
sys-apps/kmod tools sys-apps/kmod tools
sys-apps/portage python3 ipc
sys-devel/gcc cxx nptl sys-devel/gcc cxx nptl
sys-fs/udev gudev sys-fs/udev gudev
sys-kernel/gentoo-sources symlink sys-kernel/gentoo-sources symlink