diff options
| author | Dan McDonald <danmcd@mnx.io> | 2022-05-27 16:35:03 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@mnx.io> | 2022-05-27 16:35:03 -0400 |
| commit | 3b388ac65f77d884c38b4f71ecbc03d937784094 (patch) | |
| tree | 5a0ff07b63d67d3ec437cd35319222d9922e2e46 | |
| parent | 6e5d40570a82e0c754b4e52eb9938ddb24d099d9 (diff) | |
| parent | b0d58672df8644288a5fdce6ae229eaaa0db2de7 (diff) | |
| download | illumos-joyent-3b388ac65f77d884c38b4f71ecbc03d937784094.tar.gz | |
[illumos-gate merge]
commit b0d58672df8644288a5fdce6ae229eaaa0db2de7
14711 wsdiff should display SHT_REL symbolically
commit 43075873f664db76209f1fdf87cb3961a113bfaf
14715 libsa: Fix a bug in nvlist creation
| -rw-r--r-- | usr/src/boot/Makefile.version | 2 | ||||
| -rw-r--r-- | usr/src/boot/libsa/zfs/nvlist.c | 1 | ||||
| -rw-r--r-- | usr/src/tools/scripts/wsdiff.py | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/usr/src/boot/Makefile.version b/usr/src/boot/Makefile.version index 58f7f184e0..ee48155eb7 100644 --- a/usr/src/boot/Makefile.version +++ b/usr/src/boot/Makefile.version @@ -34,4 +34,4 @@ LOADER_VERSION = 1.1 # Use date like formatting here, YYYY.MM.DD.XX, without leading zeroes. # The version is processed from left to right, the version number can only # be increased. -BOOT_VERSION = $(LOADER_VERSION)-2022.04.21.2 +BOOT_VERSION = $(LOADER_VERSION)-2022.05.27.1 diff --git a/usr/src/boot/libsa/zfs/nvlist.c b/usr/src/boot/libsa/zfs/nvlist.c index 96b0e63736..bf25d4f65d 100644 --- a/usr/src/boot/libsa/zfs/nvlist.c +++ b/usr/src/boot/libsa/zfs/nvlist.c @@ -1209,6 +1209,7 @@ nvlist_add_common(nvlist_t *nvl, const char *name, data_type_t type, nvl->nv_idx += sizeof (*hp); xdr.xdr_buf = nvl->nv_data; + xdr.xdr_buf_size = nvl->nv_asize; xdr.xdr_idx = nvl->nv_idx; xdr.xdr_idx += xdr.xdr_putuint(&xdr, namelen); diff --git a/usr/src/tools/scripts/wsdiff.py b/usr/src/tools/scripts/wsdiff.py index ee76209bba..f5364101ea 100644 --- a/usr/src/tools/scripts/wsdiff.py +++ b/usr/src/tools/scripts/wsdiff.py @@ -826,7 +826,8 @@ def diff_elf_section(f1, f2, section, sh_type) : tmpFile1 = tmpDir1 + os.path.basename(f1) + t.name tmpFile2 = tmpDir2 + os.path.basename(f2) + t.name - if (sh_type == "SHT_RELA") : # sh_type == SHT_RELA + if ((sh_type == "SHT_RELA") or + (sh_type == "SHT_REL")): # relocation section cmd1 = elfdump_cmd + " -r " + f1 + " > " + tmpFile1 cmd2 = elfdump_cmd + " -r " + f2 + " > " + tmpFile2 elif (section == ".group") : @@ -1606,4 +1607,3 @@ if __name__ == '__main__' : main() except KeyboardInterrupt : cleanup(1); - |