From 5fd5b37d8a8c2acebcb313d40ceb18cbb645f71e Mon Sep 17 00:00:00 2001 From: "Justin C. Sherrill" Date: Tue, 11 Jun 2019 21:28:26 -0400 Subject: [PATCH] Changes for 5.6. --- etc/Makefile.usr | 2 +- sys/conf/newvers.sh | 2 +- sys/sys/param.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/etc/Makefile.usr b/etc/Makefile.usr index e29423aa6b..0bccc486c2 100644 --- a/etc/Makefile.usr +++ b/etc/Makefile.usr @@ -7,7 +7,7 @@ GITURL_SRC?=git://git.dragonflybsd.org/dragonfly.git # Branch to be fetched & checked out # * master - latest development branch # * DragonFly_RELEASE_x_y - stable release branch x.y -BRANCH?=master +BRANCH?=DragonFly_RELEASE_5_6 # DPorts source repository GITURL_DPORTS?=git://mirror-master.dragonflybsd.org/dports.git diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 2530ecaa3d..f8548b4d64 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -39,7 +39,7 @@ fi # Set the branch # -BRANCH="DEVELOPMENT_5_5" +BRANCH="RELEASE_5_6" TYPE="DragonFly" diff --git a/sys/sys/param.h b/sys/sys/param.h index 895d910c74..2a0b59851d 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -201,9 +201,10 @@ * 500504 - removed , only remains * 500505 - rename to * 500506 - LibreSSL, OpenSSH, XZ, libarchive update, libopie/libmd deprecation + * 500600 - 5.6 release */ #undef __DragonFly_version -#define __DragonFly_version 500506 /* propagated to newvers */ +#define __DragonFly_version 500600 /* propagated to newvers */ #include -- 2.11.4.GIT