17 Commits

Author SHA1 Message Date
Charles Short
a933729a1f debian: Add debian package for grubby
Add new debian package for grubby in order for the ansible
playbooks and puppet modules to complete.

Story: 2009101
Task: 44402

Test Plan
PASS Build Pakcage
PASS Add package to ISO
PASS Boot ISO

Signed-off-by: Charles Short <charles.short@windriver.com>
Change-Id: If7489106cafd8c1283ffdb24c9f14dfe9c480c39
2022-02-04 16:32:22 +00:00
Jim Somerville
589e8020db grub2: cleanup meta patches
This commit results in no change to actual code.  It
cleans up the following issues in the meta patches:

- some patches generated fuzz and offset warnings
- patch file names do not match that generated by
  git format-patch
- some patches were not in git format, did not have
  a proper git header
- some patches were not signed off by anybody
- file names contained grub2 which is redundant
- one patch added a blank line to the end of a file
  generating a warning, and a subsequent patch removed
  it.  This has now been squashed out.

There are 13 patches in total, they were numbered 1-14 with
4 being absent.  They are now numbered 1-13.

Verification:
Built and captured the output, verified that there are no
more fuzz and offset warnings.

Closes-Bug: 1959037

Change-Id: I8056adf3ee96dc036262aa8c2d9eecfc353cc5ba
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
2022-01-27 10:45:07 -05:00
Charles Short
107f773837 debian: Serialize grub build
Grub unit tests do not like more than 1 CPU being
specified when building the package. So set the jobs
to 1 in the meta_data.yaml. Build will be slower but
at least it will build.

Test Plan:

Pass: successfully build test
Pass: successfully install test
Pass: successfully boot test

Depends-On: https://review.opendev.org/c/starlingx/root/+/821048

Story: 2009221
Task: 43679

Change-Id: I8bda78819a14995618d4504471d24b0ffebb6ca2
Signed-off-by: Charles Short <charles.short@windriver.com>
2022-01-19 08:21:40 -05:00
Bin Qian
45e97910d5 relocate /pxeboot to /var/pxeboot
Relocate writable /pxeboot dir to /var/pxeboot

Story: 2009101
Task: 44229

TCs are list https://review.opendev.org/c/starlingx/metal/+/822008.

Depends-on: https://review.opendev.org/c/starlingx/metal/+/822008
Change-Id: Ia1d12db455bc72c5ef7c111f0fb398aabeed1266
Signed-off-by: Bin Qian <bin.qian@windriver.com>
2021-12-23 14:29:00 -05:00
Yue Tao
2caa2ff976 grub2: add deb folder
Porting CentOS patch 1001-add-tboot.patch

Ignore 3 CentOS patches:

a) 1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch

It replaces "CentOS" with "Linux" in grub menu, that is
introduced by a patch from grub2-2.02-0.86.el7.centos.src.rpm.

0176-Make-grub2-mkconfig-construct-titles-that-look-like-.patch

b) 1002-Don-t-write-trailing-colon-when-populating-MAC-strin.patch

It is the supplement patch of 0263-Fix-grub_net_hwaddr_to_str.patch,
which is from grub2-2.02-0.86.el7.centos.src.rpm. The original issue
is introduced by 0248-Add-support-for-non-Ethernet-network-cards.patch,
which is also from grub2-2.02-0.86.el7.centos.src.rpm.

3) 1003-tftp-roll-over-block-counter-to-prevent-timeouts-wit.patch

It is duplicate of the patch in grub2_2.04-20.debian.tar.xz.

debian/patches/tftp-roll-over-block-counter.patch

Other patches in centos/meta_patches modify the spec file. The grub2
for each distributions is deep customized, so just ignore them.

BTW, not using dl_path, because the package on salsa.debian.org has
building issue.

Test Plan:

Pass: successfully build test
Pass: successfully install test
Pass: successfully boot test

Story: 2009221
Task: 43679
Signed-off-by: Yue Tao <yue.tao@windriver.com>
Change-Id: Icfd2f1993fd123824155c94da26c0ddf9a9c0873
2021-12-07 22:45:15 +00:00
Jiping Ma
572cd24c49 tftp: roll over block counter to prevent timeouts with data packets
The block number is a 16-bit counter which only allows to fetch
files no bigger than 65535 * blksize. To avoid this limit, the
counter is rolled over. This behavior isn't defined in RFC 1350
but is handled by many TFTP servers and it's what GRUB was doing
before implicitly due an overflow.

Closes-Bug: #1938559

Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
Change-Id: I4a0c04cf15b87f6f40c7a979d20fb3c57657cefd
2021-09-01 20:57:18 -04:00
Zhixiong Chi
a0b2acecaa grub2: fix CVE-2020-15707
Avoid to the heap-based buffer overflow.

Upgrade to the below package to fix the CVE issue:
 grub2-2.02-0.86.el7.centos.src.rpm

At the same time adjust the context and drop
0004-grub2-remove-32b-requirements.patch since it already had been
included in the new version.

Story: 2008532
Task: 41664
Change-Id: I7943127323ee28457ffe0a4ece54764633f86d9f
Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
2021-01-25 04:15:59 -05:00
Dongqi Chen
af359d4938 Add auto-versioning to starlingx/integ packages
This update makes use of the PKG_GITREVCOUNT variable
to auto-version the packages in this repo.

Story: 2007750
Task: 39951
Change-Id: I854419c922b9db4edbbf6f1e987a982ec2ec7b59
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
2020-06-24 09:48:28 +08:00
Martin, Chen
54fa029a43 Fix pxe boot fail, for incorrect folder access /pxe/EFI/ on controller-0
Closes-Bug: 1814360

Test Case:
Deploy 2 controller and 1 compute on bare metal

Change-Id: I4ec59180a28ac743935601332cb8f210e87e4a85
Signed-off-by: Martin, Chen <haochuan.z.chen@intel.com>
2019-02-12 05:06:53 +08:00
Zuul
d89dbd238a Merge "rebase grub2 patch to CentOS 7.6 version" into f/centos76 2019-01-15 05:29:43 +00:00
Zhe Hu
f3729d2d23 rebase grubby patch to CentOS 7.6 version
Test:
Pass build and simplex deploy test

Depends-On: https://review.openstack.org/627466

Story: 2004522
Task: 28419

Change-Id: Ieaf38802edbd21471ff2ccf4bd64c687d7929b72
Signed-off-by: Zhe Hu <zhe.hu@intel.com>
2018-12-27 14:46:31 +08:00
Zhe Hu
b5306a34ee rebase grub2 patch to CentOS 7.6 version
Test:
Pass build and simplex deploy test

Depends-On: https://review.openstack.org/627434

Story: 2004522
Task: 28417

Change-Id: Ibd2c0866dc5d7f4475e3da6ad5aeedc284ed5829
Signed-off-by: Zhe Hu <zhe.hu@intel.com>
2018-12-27 12:23:40 +08:00
slin14
d3d8639028 de-fuzz grub2 patches
When do Centos 7.5 upgraded, some patches didn't resolve and cause
the fuzzy in the line numbers of the patches. And it may cause
.orig file is created when do patch. And this .orig file will lead
to rpm packaging failure due to the unexpected and unpackaged .orig
file.

Please visit below link to get more detail info:
https://bugs.launchpad.net/starlingx/+bug/1794611

Solution:
  Safest solution is to de-fuzz our patches.

Story: 2003389
Task: 26755

Change-Id: I4bcf73175e81083a575d35d4b1448b29b11beaf7
Signed-off-by: slin14 <shuicheng.lin@intel.com>
2018-09-28 08:10:39 +08:00
slin14
11c474e8de rebase grub2 patch to CentOS7.5
Story: 2003389
Task: 24495

Change-Id: Ia5ccf65e9c3e462710694f1e860bf4281339ca85
Signed-off-by: slin14 <shuicheng.lin@intel.com>
2018-08-27 03:03:28 +00:00
jmckenna
b546e2213b Uprev grub2 package to 0.64
Uprev grub2 package to 0.64.  This required regeneration and
restructuring of the patch and meta-patch files

Depends-On: https://review.openstack.org/#/c/578440

Change-Id: I462cefad6dd929601f6368364ef83327f69be161
Signed-off-by: Scott Little <scott.little@windriver.com>
2018-08-01 15:39:52 -04:00
Scott Little
c428727bf5 Relocate grub2 to stx-integ/grub/grub2
Move content from stx-gplv3 into stx-integ

Packages will be relocated to

stx-integ:
    base/
        anaconda
        crontabs
        dnsmasq
        rsync

    database/
        python-psycopg2

    filesystem/
        parted

    grub/
        grub2

    security/
        python-keyring

Change-Id: Ib2807e3762a9ad17ef246398ab8e8cb7a7cf335c
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
2018-08-01 15:39:49 -04:00
Scott Little
50838ff661 Relocate grubby to stx-integ/grub/grubby
Move content from stx-utils into stx-integ or stx-update

Packages will be relocated to

stx-update:
    enable-dev-patch
    extras

stx-integ:
    config-files/
        io-scheduler

    filesystem/
        filesystem-scripts

    grub/
        grubby

    logging/
        logmgmt

    tools/
        collector
        monitor-tools

    tools/engtools/
        hostdata-collectors
        parsers

    utilities/
        build-info
        branding   (formerly wrs-branding)
        platform-util

Change-Id: If77fdabde9ff43b5e4381837283bac1d39112c58
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
2018-08-01 12:25:42 -04:00