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

* kernel: Don't pass "-n" to emerge when emerging the kernel as stage4s 

don't have the kernel sources and subsequent builds will fail

* kernel: Remove any old kernel and modules before installing new

* Don't link /bin/sh to dash if DASH != YES

* Add appliance name and creation date comments to package list files
This commit is contained in:
Albert Hopkins 2011-06-27 06:43:59 -04:00
parent a545aca3b2
commit 3077913344
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -168,12 +168,14 @@ kernel: base_system $(KERNEL_CONFIG)
$(inroot) cp /usr/share/zoneinfo/$(TIMEZONE) /etc/localtime $(inroot) cp /usr/share/zoneinfo/$(TIMEZONE) /etc/localtime
echo $(TIMEZONE) > "$(CHROOT)"/etc/timezone echo $(TIMEZONE) > "$(CHROOT)"/etc/timezone
ifneq ($(EXTERNAL_KERNEL),YES) ifneq ($(EXTERNAL_KERNEL),YES)
$(inroot) $(EMERGE) -n $(USEPKG) sys-kernel/$(KERNEL) $(inroot) $(EMERGE) $(USEPKG) sys-kernel/$(KERNEL)
cp $(KERNEL_CONFIG) $(CHROOT)/usr/src/linux/.config cp $(KERNEL_CONFIG) $(CHROOT)/usr/src/linux/.config
$(gcc_config) $(gcc_config)
$(inroot) make $(MAKEOPTS) -C /usr/src/linux oldconfig $(inroot) make $(MAKEOPTS) -C /usr/src/linux oldconfig
$(inroot) make $(MAKEOPTS) -C /usr/src/linux $(inroot) make $(MAKEOPTS) -C /usr/src/linux
$(inroot) rm -rf /lib/modules/*
$(inroot) make $(MAKEOPTS) -C /usr/src/linux modules_install $(inroot) make $(MAKEOPTS) -C /usr/src/linux modules_install
$(inroot) rm -f /boot/vmlinuz*
$(inroot) make $(MAKEOPTS) -C /usr/src/linux install $(inroot) make $(MAKEOPTS) -C /usr/src/linux install
cd $(CHROOT)/boot ; \ cd $(CHROOT)/boot ; \
k=`/bin/ls -1 --sort=time vmlinuz-*|head -n 1` ; \ k=`/bin/ls -1 --sort=time vmlinuz-*|head -n 1` ; \
@ -221,8 +223,8 @@ ifeq ($(DASH),YES)
echo /bin/dash >> $(CHROOT)/etc/shells; \ echo /bin/dash >> $(CHROOT)/etc/shells; \
$(inroot) chsh -s /bin/dash root; \ $(inroot) chsh -s /bin/dash root; \
fi fi
endif
$(inroot) ln -sf dash /bin/sh $(inroot) ln -sf dash /bin/sh
endif
touch systools touch systools
grub: stage3 grub.conf kernel partitions grub: stage3 grub.conf kernel partitions
@ -264,7 +266,11 @@ build-software: systools issue etc-update.conf $(CRITICAL) $(WORLD)
software: stage3 $(software_extra) software: stage3 $(software_extra)
ifneq ($(PKGLIST),0) ifneq ($(PKGLIST),0)
(cd "$(CHROOT)"/var/db/pkg ; /bin/ls -1d */*) > $(LST_FILE) echo \# > $(LST_FILE)
echo \# Gentoo Virtual Appliance \"$(APPLIANCE)\" package list >> $(LST_FILE)
echo \# Generated `date -u` >> $(LST_FILE)
echo \# >> $(LST_FILE)
(cd "$(CHROOT)"/var/db/pkg ; /bin/ls -1d */*) >> $(LST_FILE)
endif endif
touch software touch software