diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-07-26 13:10:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-26 13:10:56 +0000 |
| commit | c26f1331c8823c9555fc698217225bbe981d5cb9 (patch) | |
| tree | b1a2cc724e9eb27dc4e83a2ebfff0cd8f5f13fc8 /patches/opnfv-fuel | |
| parent | 0fe69a93bbdc342f2cca486ceec709a8073bb62c (diff) | |
| parent | aa0dff61a00fb6d1f52b0aea41264ae955d7672c (diff) | |
Merge "kernel-flavor: Add linux-image-generic-lts-xenial"
Diffstat (limited to 'patches/opnfv-fuel')
| -rw-r--r-- | patches/opnfv-fuel/0023-bootstrap-Add-armband-rtc-efi-fix-package.patch | 38 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0028-bootstrap-Add-lshw-package.patch | 3 |
2 files changed, 1 insertions, 40 deletions
diff --git a/patches/opnfv-fuel/0023-bootstrap-Add-armband-rtc-efi-fix-package.patch b/patches/opnfv-fuel/0023-bootstrap-Add-armband-rtc-efi-fix-package.patch deleted file mode 100644 index 813fbafb..00000000 --- a/patches/opnfv-fuel/0023-bootstrap-Add-armband-rtc-efi-fix-package.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Sun, 17 Apr 2016 15:37:38 +0200 -Subject: [PATCH] bootstrap: Add armband-rtc-efi-fix package. - -Older ThunderX and possibly other UEFI-enabled targets do not support -rtc-efi properly, so they end up filling dmesg with useless -complaints about not being able to read system time. - -armband-rtc-efi-fix validates rtc-efi can be used on the system, -otherwise it rmmods rtc_efi kernel module via rcS script. - -This patch hardcodes the addition of armband-rtc-ef-fix package during -bootstrap image build. - -NOTES: -This could be later removed or, if other fixes need to be delivered -like this, grouped in a meta package. - -Fuel 9.0 moved default package list to openstack.yaml fixture, see [1]. - -[1] https://github.com/openstack/fuel-web/commit/ - 4ee42effe27694bd231663e3d0f10c0c42877177 ---- - build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml -index 2e4843d..15d9e9d 100644 ---- a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml -+++ b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml -@@ -7,6 +7,7 @@ - output_dir: /tmp/ - kernel_flavor: linux-image-generic-lts-trusty - packages: -+ - armband-rtc-efi-fix - - fuel-agent - - hwloc - - hpsa-dkms diff --git a/patches/opnfv-fuel/0028-bootstrap-Add-lshw-package.patch b/patches/opnfv-fuel/0028-bootstrap-Add-lshw-package.patch index 7120086e..a811f2f3 100644 --- a/patches/opnfv-fuel/0028-bootstrap-Add-lshw-package.patch +++ b/patches/opnfv-fuel/0028-bootstrap-Add-lshw-package.patch @@ -20,8 +20,7 @@ diff --git a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml b/build/f_isoro index 15d9e9d..b45a14a 100644 --- a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml +++ b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml -@@ -17,6 +17,7 @@ - - linux-headers-generic +@@ -17,5 +17,6 @@ - live-boot - live-boot-initramfs-tools + - lshw |