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

Tweaks: 

* Added UDEV Makefile variable, if set to NO, will disable UDEV and use
  static /dev (defaults to YES)

* Run eselct python to get around "which python am i?" situation

* export "inroot" variable
This commit is contained in:
Albert Hopkins 2011-04-02 09:56:19 -04:00
parent 1e86ba4d60
commit 029d732f06
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -18,6 +18,7 @@ ENABLE_SSHD = NO
CHANGE_PASSWORD = YES CHANGE_PASSWORD = YES
HEADLESS = NO HEADLESS = NO
EXTERNAL_KERNEL = NO EXTERNAL_KERNEL = NO
UDEV = YES
ACCEPT_KEYWORDS = amd64 ACCEPT_KEYWORDS = amd64
M4 = m4 M4 = m4
@ -79,7 +80,7 @@ endif
gcc_config = $(inroot) gcc-config 1 gcc_config = $(inroot) gcc-config 1
export APPLIANCE ACCEPT_KEYWORDS CHROOT EMERGE HEADLESS M4 M4C export APPLIANCE ACCEPT_KEYWORDS CHROOT EMERGE HEADLESS M4 M4C inroot
export HOSTNAME MAKEOPTS PRUNE_CRITICAL TIMEZONE USEPKG WORLD OVERLAY export HOSTNAME MAKEOPTS PRUNE_CRITICAL TIMEZONE USEPKG WORLD OVERLAY
unexport PKGDIR ARCH NBD_DEV unexport PKGDIR ARCH NBD_DEV
@ -219,6 +220,8 @@ software: systools issue etc-update.conf $(CRITICAL) $(WORLD)
cp issue $(CHROOT)/etc/issue cp issue $(CHROOT)/etc/issue
$(gcc_config) $(gcc_config)
$(inroot) $(EMERGE) $(USEPKG) --update --newuse --deep world $(inroot) $(EMERGE) $(USEPKG) --update --newuse --deep world
# Per bug #357009
$(inroot) eselect python update
$(inroot) $(EMERGE) --depclean --with-bdeps=n $(inroot) $(EMERGE) --depclean --with-bdeps=n
$(gcc_config) $(gcc_config)
$(inroot) etc-update $(inroot) etc-update
@ -239,6 +242,13 @@ image: $(RAW_IMAGE) grub partitions device-map grub.shell systools software
$(COPY_LOOP) $(COPY_LOOP)
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)
rm -f loop/dev/vda*
/bin/mknod loop/dev/vda b 254 0
/bin/mknod loop/dev/vda1 b 254 1
/bin/mknod loop/dev/vda2 b 254 2
sed -i 's/RC_DEVICES="auto"/RC_DEVICES="static"/' loop/etc/conf.d/rc
endif endif
umount gentoo umount gentoo
rmdir gentoo rmdir gentoo