diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-04-26 16:44:37 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-02 14:39:19 +0000 |
| commit | 16ab0c7fe036f77eaad3ed611cba6a1ce50baef2 (patch) | |
| tree | 17c59907d7a5af3ee1ee5d20b9c6aa6b3844ae16 /patches/fuel-main/0003-Make-cpio-accept-symlinks.patch | |
| parent | c695afba33c538032af751dd02748f83ff4c877c (diff) | |
Rebase: Drop cpio symlink patch (upstream).
Drop p/fuel-main/0003-Make-cpio-accept-symlinks.patch,
since this is now covered by OPNFV commit f544e41,
"Correction due to changed cpio behavior".
For details, see https://jira.opnfv.org/browse/FUEL-125
Change-Id: I6c04e34cb7a5af5681745f1cdd026809c65720ce
(cherry picked from commit 890027f3b712797e699a3883d1f454a1d7c7c3bb)
Diffstat (limited to 'patches/fuel-main/0003-Make-cpio-accept-symlinks.patch')
| -rw-r--r-- | patches/fuel-main/0003-Make-cpio-accept-symlinks.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/patches/fuel-main/0003-Make-cpio-accept-symlinks.patch b/patches/fuel-main/0003-Make-cpio-accept-symlinks.patch deleted file mode 100644 index 00c2ce41..00000000 --- a/patches/fuel-main/0003-Make-cpio-accept-symlinks.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> -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 |