QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fedorize_image: install kernel-placeholder package instead of real kernel (#645)

Browse Source 
Some packages depends on kernel pkg, so must be installed in fedorize stage.
This commit is contained in:
Marek Marczykowski 2012-07-24 03:51:13 +02:00
parent 48df9b4ec2
commit f9132e0d8d
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -14,8 +14,8 @@ help:
rpms: rpms:
@export DIST NO_SIGN @export DIST NO_SIGN
@echo "Building template: $(TEMPLATE_NAME)" @echo "Building template: $(TEMPLATE_NAME)"
@sudo -E ./fedorize_image fedorized_images/$(TEMPLATE_NAME).img clean_images/packages.list && \ @./create_symlinks_in_rpms_to_install_dir.sh && \
./create_symlinks_in_rpms_to_install_dir.sh && \ sudo -E ./fedorize_image fedorized_images/$(TEMPLATE_NAME).img clean_images/packages.list && \
sudo -E ./qubeize_image fedorized_images/$(TEMPLATE_NAME).img $(TEMPLATE_NAME) && \ sudo -E ./qubeize_image fedorized_images/$(TEMPLATE_NAME).img $(TEMPLATE_NAME) && \
./build_template_rpm $(TEMPLATE_NAME) || exit 1; \ ./build_template_rpm $(TEMPLATE_NAME) || exit 1; \

1
clean_images/packages.list
View File

@ -32,3 +32,4 @@ liblzma.so.0()(64bit)
git git
createrepo createrepo
rpm-build rpm-build
./rpms_to_install/qubes-core-vm-kernel-placeholder.rpm

1
create_symlinks_in_rpms_to_install_dir.sh
View File

@ -16,6 +16,7 @@ if [ "${DIST/fc/}" -ge 15 ]; then
else else
ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-vm-sysvinit-$VERSION_CORE.rpm qubes-core-vm-init.rpm ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-vm-sysvinit-$VERSION_CORE.rpm qubes-core-vm-init.rpm
fi fi
ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-vm-kernel-placeholder-1.0-1.$DIST.x86_64.rpm qubes-core-vm-kernel-placeholder.rpm
# FIXME: rel hardcoded # FIXME: rel hardcoded
VERSION_GUI=$(cat $SRC_ROOT/gui/version)-1.$DIST.x86_64 VERSION_GUI=$(cat $SRC_ROOT/gui/version)-1.$DIST.x86_64