From owner-svn-src-projects@freebsd.org Tue Feb 16 20:11:01 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7D6C0AAA12D for ; Tue, 16 Feb 2016 20:11:01 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 30DDAD6B; Tue, 16 Feb 2016 20:11:01 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1GKB0wY027388; Tue, 16 Feb 2016 20:11:00 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1GKB0MP027387; Tue, 16 Feb 2016 20:11:00 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201602162011.u1GKB0MP027387@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 16 Feb 2016 20:11:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r295669 - projects/release-pkg X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Feb 2016 20:11:01 -0000 Author: gjb Date: Tue Feb 16 20:11:00 2016 New Revision: 295669 URL: https://svnweb.freebsd.org/changeset/base/295669 Log: Always include the kernel name in the resulting package. While functionally expected to be a no-op on big-iron hardware, embedded hardware (arm, mips) do not have a GENERIC kernel, so the KERNCONF value must be included in the package to avoid conflicting packages for the default kernel (RPI-B versus RPI2, for example). While here, correct the kernel name in the metadata. Sponsored by: The FreeBSD Foundation Modified: projects/release-pkg/Makefile.inc1 Modified: projects/release-pkg/Makefile.inc1 ============================================================================== --- projects/release-pkg/Makefile.inc1 Tue Feb 16 19:36:25 2016 (r295668) +++ projects/release-pkg/Makefile.inc1 Tue Feb 16 20:11:00 2016 (r295669) @@ -1424,25 +1424,25 @@ create-kernel-packages: _pkgbootstrap .for flavor in release debug @cd ${DESTDIR}/${DISTDIR} ; \ awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \ - -v kernel=yes \ + -v kernel=yes -v _kernconf=${INSTALLKERNEL} \ ${DESTDIR}/kernel.meta ; \ cap_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VCAP_MKDB_ENDIAN` ; \ pwd_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VPWD_MKDB_ENDIAN` ; \ sed -e "s/%VERSION%/${PKG_VERSION}/" \ - -e "s/%PKGNAME%/kernel-${flavor}/" \ - -e "s/%COMMENT%/FreeBSD ${INSTKERNNAME} kernel ${flavor}/" \ - -e "s/%DESC%/FreeBSD ${INSTKERNNAME} kernel ${flavor}/" \ + -e "s/%PKGNAME%/kernel-${INSTALLKERNEL:tl}-${flavor}/" \ + -e "s/%COMMENT%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \ + -e "s/%DESC%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \ -e "s/%CAP_MKDB_ENDIAN%/$${cap_arg}/g" \ -e "s/%PWD_MKDB_ENDIAN%/$${pwd_arg}/g" \ ${SRCDIR}/release/packages/kernel.ucl \ - > ${DESTDIR}/${DISTDIR}/kernel-${flavor}.ucl ; \ + > ${DESTDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}-${flavor}.ucl ; \ awk -F\" ' \ /name/ { printf("===> Creating %s-", $$2); next } \ /version/ {print $$2; next } ' \ - ${DESTDIR}/${DISTDIR}/kernel-${flavor}.ucl ; \ + ${DESTDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}-${flavor}.ucl ; \ pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh \ - create -M ${DESTDIR}/${DISTDIR}/kernel-${flavor}.ucl \ - -p ${DESTDIR}/${DISTDIR}/kernel-${flavor}.plist \ + create -M ${DESTDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}-${flavor}.ucl \ + -p ${DESTDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}-${flavor}.plist \ -r ${DESTDIR}/${DISTDIR} \ -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} .endfor