diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-16 17:11:34 -0800 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-08 18:21:44 -0500 |
| commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
| tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /poky/documentation/poky.ent | |
| parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
| download | talos-openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.gz talos-openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.zip | |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/documentation/poky.ent')
| -rw-r--r-- | poky/documentation/poky.ent | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/poky/documentation/poky.ent b/poky/documentation/poky.ent index 1b71b8070..c76fe7b2d 100644 --- a/poky/documentation/poky.ent +++ b/poky/documentation/poky.ent @@ -1,17 +1,17 @@ -<!ENTITY DISTRO "2.5.2"> -<!ENTITY DISTRO_COMPRESSED "252"> -<!ENTITY DISTRO_NAME_NO_CAP "sumo"> -<!ENTITY DISTRO_NAME "Sumo"> -<!ENTITY DISTRO_NAME_NO_CAP_MINUS_ONE "rocko"> -<!ENTITY DISTRO_NAME_MINUS_ONE "Rocko"> -<!ENTITY YOCTO_DOC_VERSION "2.5.2"> -<!ENTITY YOCTO_DOC_VERSION_MINUS_ONE "2.4.4"> -<!ENTITY DISTRO_REL_TAG "yocto-2.5.2"> -<!ENTITY METAINTELVERSION "9.2"> +<!ENTITY DISTRO "2.6.1"> +<!ENTITY DISTRO_COMPRESSED "261"> +<!ENTITY DISTRO_NAME_NO_CAP "thud"> +<!ENTITY DISTRO_NAME "Thud"> +<!ENTITY DISTRO_NAME_NO_CAP_MINUS_ONE "sumo"> +<!ENTITY DISTRO_NAME_MINUS_ONE "Sumo"> +<!ENTITY YOCTO_DOC_VERSION "2.6.1"> +<!ENTITY YOCTO_DOC_VERSION_MINUS_ONE "2.5.2"> +<!ENTITY DISTRO_REL_TAG "yocto-2.6.1"> +<!ENTITY METAINTELVERSION "9.0"> <!ENTITY REL_MONTH_YEAR "December 2018"> <!ENTITY META_INTEL_REL_TAG "&METAINTELVERSION;-&DISTRO_NAME_NO_CAP;-&YOCTO_DOC_VERSION;"> -<!ENTITY POKYVERSION "20.0.2"> -<!ENTITY POKYVERSION_COMPRESSED "2002"> +<!ENTITY POKYVERSION "21.0.1"> +<!ENTITY POKYVERSION_COMPRESSED "2101"> <!ENTITY YOCTO_POKY "poky-&DISTRO_NAME_NO_CAP;-&POKYVERSION;"> <!ENTITY COPYRIGHT_YEAR "2010-2019"> <!ENTITY YOCTO_DL_URL "http://downloads.yoctoproject.org"> |
