summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile1
-rw-r--r--patches/fuel-main/0003-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch (renamed from patches/fuel-main/0004-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch)0
-rw-r--r--patches/fuel-main/0003-Make-cpio-accept-symlinks.patch27
-rw-r--r--patches/opnfv-fuel/0011-f_repobuild-Makefile-Use-python-debian-from-pip.patch29
m---------upstream/fuel0
5 files changed, 29 insertions, 28 deletions
diff --git a/Makefile b/Makefile
index f954a611..f077823d 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,6 @@ build:
PRODUCT_NAME=mos \
CENTOS_MAJOR=7 \
EXTRA_RPM_REPOS="armband,http://linux.enea.com/mos-repos/centos/mos8.0-centos7-fuel/armband/x86_64,10" \
- MIRROR_UBUNTU_URL=http://archive.ubuntu.com/ubuntu/ \
LATEST_MIRROR_ID_URL=http://linux.enea.com/ \
JAVA8_URL=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_arm64.deb \
$(EXTRA_PARAMS) \
diff --git a/patches/fuel-main/0004-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch b/patches/fuel-main/0003-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch
index e3d13b85..e3d13b85 100644
--- a/patches/fuel-main/0004-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch
+++ b/patches/fuel-main/0003-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch
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
diff --git a/patches/opnfv-fuel/0011-f_repobuild-Makefile-Use-python-debian-from-pip.patch b/patches/opnfv-fuel/0011-f_repobuild-Makefile-Use-python-debian-from-pip.patch
new file mode 100644
index 00000000..f84b4c0c
--- /dev/null
+++ b/patches/opnfv-fuel/0011-f_repobuild-Makefile-Use-python-debian-from-pip.patch
@@ -0,0 +1,29 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Tue, 26 Apr 2016 23:12:20 +0200
+Subject: [PATCH] f_repobuild/Makefile: Use python-debian from pip.
+
+Currently, Ubuntu Trusty provides a broken python-debian package,
+that fails to parse foreign architecture (package:any) relationships.
+
+Purge debian package and let pip resolve this dependency, using a
+newer version from pypi.
+
+[1] http://lists.alioth.debian.org/pipermail/
+ pkg-python-debian-maint/2014-July/001795.html
+---
+ build/f_isoroot/f_repobuild/Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile
+index 709ca6b..5e7157b 100644
+--- a/build/f_isoroot/f_repobuild/Makefile
++++ b/build/f_isoroot/f_repobuild/Makefile
+@@ -25,6 +25,8 @@ all: nailgun
+
+ nailgun:
+ sudo apt-get install -y git libxml2-dev libxslt-dev python-dev python-pip libz-dev libyaml-dev createrepo python-yaml
++ # python-debian from Ubuntu can't parse foreign arch relationships, use pip
++ sudo apt-get purge -y --force-yes python-debian
+ rm -Rf nailgun
+ sudo mkdir -p /var/www/nailgun
+ git clone $(FUEL_MIRROR_REPO)
diff --git a/upstream/fuel b/upstream/fuel
-Subproject c6e6a032ce80f6b8a781383ebe72f3ca9572b26
+Subproject 6a42aafa48d339ba3164bd03006a5cf128b5529