diff options
| author | Stewart Smith <stewart@linux.ibm.com> | 2018-07-31 18:34:16 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-31 18:34:16 +1000 |
| commit | fa4f099dafe7d8f19758522f4ad10f40cccbf14a (patch) | |
| tree | 6911f28b305e2e8d35520de1d6272201eaaed707 | |
| parent | 6f62995ffbb6f37b4eba491c93fa1d7efc6636fc (diff) | |
| parent | 82bcda458940f0c6e83da3bbd8b488726c8dba3e (diff) | |
| download | blackbird-op-build-fa4f099dafe7d8f19758522f4ad10f40cccbf14a.tar.gz blackbird-op-build-fa4f099dafe7d8f19758522f4ad10f40cccbf14a.zip | |
Merge pull request #2255 from sammj/pb-bump-2.0.y
Update to Petitboot v1.7.2 and include udhcpc dependency
| -rw-r--r-- | openpower/custom/patches/busybox/busybox-0001-udhcp-add-option-211-reboot-time.patch | 49 | ||||
| -rw-r--r-- | openpower/package/petitboot/petitboot.mk | 2 |
2 files changed, 50 insertions, 1 deletions
diff --git a/openpower/custom/patches/busybox/busybox-0001-udhcp-add-option-211-reboot-time.patch b/openpower/custom/patches/busybox/busybox-0001-udhcp-add-option-211-reboot-time.patch new file mode 100644 index 00000000..36fa63e2 --- /dev/null +++ b/openpower/custom/patches/busybox/busybox-0001-udhcp-add-option-211-reboot-time.patch @@ -0,0 +1,49 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jeremy Kerr <jk@ozlabs.org> +Date: Tue, 3 Jul 2018 16:36:13 +1000 +Subject: [PATCH] udhcp: add option 211, "reboot time" + +As defined in RFC 5071. + +Signed-off-by: Jeremy Kerr <jk@ozlabs.org> +Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> +--- + networking/udhcp/common.c | 2 ++ + networking/udhcp/common.h | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c +index 52ef875f0..77fb07cdc 100644 +--- a/networking/udhcp/common.c ++++ b/networking/udhcp/common.c +@@ -65,6 +65,7 @@ const struct dhcp_optflag dhcp_optflags[] = { + #endif + { OPTION_STRING , 0xd1 }, /* DHCP_PXE_CONF_FILE */ + { OPTION_STRING , 0xd2 }, /* DHCP_PXE_PATH_PREFIX */ ++ { OPTION_U32 , 0xd3 }, /* DHCP_REBOOT_TIME */ + { OPTION_6RD , 0xd4 }, /* DHCP_6RD */ + { OPTION_STATIC_ROUTES | OPTION_LIST , 0xf9 }, /* DHCP_MS_STATIC_ROUTES */ + { OPTION_STRING , 0xfc }, /* DHCP_WPAD */ +@@ -133,6 +134,7 @@ const char dhcp_option_strings[] ALIGN1 = + #endif + "pxeconffile" "\0" /* DHCP_PXE_CONF_FILE */ + "pxepathprefix" "\0" /* DHCP_PXE_PATH_PREFIX */ ++ "reboottime" "\0" /* DHCP_REBOOT_TIME */ + "ip6rd" "\0" /* DHCP_6RD */ + "msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */ + "wpad" "\0" /* DHCP_WPAD */ +diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h +index 50ea9199b..550161934 100644 +--- a/networking/udhcp/common.h ++++ b/networking/udhcp/common.h +@@ -156,6 +156,7 @@ enum { + //#define DHCP_VLAN_PRIORITY 0x85 /* 802.1Q VLAN priority */ + //#define DHCP_PXE_CONF_FILE 0xd1 /* RFC 5071 Configuration File */ + //#define DHCP_PXE_PATH_PREFIX 0xd2 /* RFC 5071 Configuration File */ ++//#define DHCP_REBOOT_TIME 0xd3 /* RFC 5071 Reboot time */ + //#define DHCP_MS_STATIC_ROUTES 0xf9 /* Microsoft's pre-RFC 3442 code for 0x79? */ + //#define DHCP_WPAD 0xfc /* MSIE's Web Proxy Autodiscovery Protocol */ + #define DHCP_END 0xff +-- +2.18.0 + diff --git a/openpower/package/petitboot/petitboot.mk b/openpower/package/petitboot/petitboot.mk index 38db0e45..a886b0dc 100644 --- a/openpower/package/petitboot/petitboot.mk +++ b/openpower/package/petitboot/petitboot.mk @@ -4,7 +4,7 @@ # ################################################################################ -PETITBOOT_VERSION = v1.7.1 +PETITBOOT_VERSION = v1.7.2 PETITBOOT_SITE ?= $(call github,open-power,petitboot,$(PETITBOOT_VERSION)) PETITBOOT_DEPENDENCIES = ncurses udev host-bison host-flex lvm2 PETITBOOT_LICENSE = GPLv2 |
