From 0f762e556ea7b2393f56ca7fb8e06f66f99880aa Mon Sep 17 00:00:00 2001 From: Stanislaw Kardach Date: Tue, 29 Mar 2016 15:06:02 +0200 Subject: Clean up and fix Libvirt and Ceph [ Stanislaw Kardach ] * Fix upload_cirros timeout * Workaround for default video device in nova * Fix syntax and increase TestVM's RAM requirements [ Alexandru Avadanii ] * Cleanup: Obsolete SEPARATE_IMAGES. * Nova libvirt drv: arm64: Update console default. * fuel{,-main}: Cleanup obsolete patches. * nova: Fix inject for direct boot with part table. See https://bugs.launchpad.net/nova/+bug/1290455 for full bug description. For now, we detect direct kernel boot with a partition table inside disk image by passing target_partition when root kernel arg points to a partition (instead of the whole disk). * Drop obsolete/done TODO entries. * Nova: Fix os cmd line parsing for list case. * ceph: Fix obsolete XFS mount param. * Fix out-of-order embedded patch hunks. Signed-off-by: Stanislaw Kardach Signed-off-by: Alexandru Avadanii --- .../fuel-main/0005-Make-cpio-accept-symlinks.patch | 27 ---------------------- 1 file changed, 27 deletions(-) delete mode 100644 patches/fuel-main/0005-Make-cpio-accept-symlinks.patch (limited to 'patches/fuel-main/0005-Make-cpio-accept-symlinks.patch') diff --git a/patches/fuel-main/0005-Make-cpio-accept-symlinks.patch b/patches/fuel-main/0005-Make-cpio-accept-symlinks.patch deleted file mode 100644 index 00c2ce41..00000000 --- a/patches/fuel-main/0005-Make-cpio-accept-symlinks.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Stanislaw Kardach -Date: Wed, 2 Mar 2016 10:04:32 +0100 -Subject: [PATCH] Make cpio accept symlinks - ---- - bootstrap/module.mk | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/bootstrap/module.mk b/bootstrap/module.mk -index cb09691..3f28172 100644 ---- a/bootstrap/module.mk -+++ b/bootstrap/module.mk -@@ -230,11 +230,11 @@ $(BUILD_DIR)/bootstrap/prepare-initram-root.done: \ - - # Installing kernel modules - find $(LOCAL_MIRROR_CENTOS_OS_BASEURL) -name '$(KERNEL_PATTERN)' | xargs rpm2cpio | \ -- ( cd $(INITRAMROOT); sudo cpio -idm './lib/modules/*' './boot/vmlinuz*' ) -+ ( cd $(INITRAMROOT); sudo cpio --extract-over-symlinks -idm './lib/modules/*' './boot/vmlinuz*' ) - find $(LOCAL_MIRROR_CENTOS_OS_BASEURL) -name '$(KERNEL_FIRMWARE_PATTERN)' | xargs rpm2cpio | \ -- ( cd $(INITRAMROOT); sudo cpio -idm './lib/firmware/*' ) -+ ( cd $(INITRAMROOT); sudo cpio --extract-over-symlinks -idm './lib/firmware/*' ) - find $(LOCAL_MIRROR_CENTOS_OS_BASEURL) -name 'libmlx4*' | xargs rpm2cpio | \ -- ( cd $(INITRAMROOT); sudo cpio -idm './etc/*' './usr/lib64/*' ) -+ ( cd $(INITRAMROOT); sudo cpio --extract-over-symlinks -idm './etc/*' './usr/lib64/*' ) - for version in `ls -1 $(INITRAMROOT)/lib/modules`; do \ - sudo depmod -b $(INITRAMROOT) $$version; \ - done -- cgit 1.2.3-korg