d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always include the kernel name in the resulting package.

Browse Source 
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
This commit is contained in:
Glen Barber 2016-02-16 20:11:00 +00:00
parent 3c76ad5c10
commit 4821f9ed5b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.inc1
View File

@ -1424,25 +1424,25 @@ create-kernel-packages: _pkgbootstrap
.for flavor in release debug .for flavor in release debug
@cd ${DESTDIR}/${DISTDIR} ; \ @cd ${DESTDIR}/${DISTDIR} ; \
awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \ awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
-v kernel=yes \ -v kernel=yes -v _kernconf=${INSTALLKERNEL} \
${DESTDIR}/kernel.meta ; \ ${DESTDIR}/kernel.meta ; \
cap_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VCAP_MKDB_ENDIAN` ; \ cap_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VCAP_MKDB_ENDIAN` ; \
pwd_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VPWD_MKDB_ENDIAN` ; \ pwd_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VPWD_MKDB_ENDIAN` ; \
sed -e "s/%VERSION%/${PKG_VERSION}/" \ sed -e "s/%VERSION%/${PKG_VERSION}/" \
-e "s/%PKGNAME%/kernel-${flavor}/" \ -e "s/%PKGNAME%/kernel-${INSTALLKERNEL:tl}-${flavor}/" \
-e "s/%COMMENT%/FreeBSD ${INSTKERNNAME} kernel ${flavor}/" \ -e "s/%COMMENT%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \
-e "s/%DESC%/FreeBSD ${INSTKERNNAME} kernel ${flavor}/" \ -e "s/%DESC%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \
-e "s/%CAP_MKDB_ENDIAN%/$${cap_arg}/g" \ -e "s/%CAP_MKDB_ENDIAN%/$${cap_arg}/g" \
-e "s/%PWD_MKDB_ENDIAN%/$${pwd_arg}/g" \ -e "s/%PWD_MKDB_ENDIAN%/$${pwd_arg}/g" \
${SRCDIR}/release/packages/kernel.ucl \ ${SRCDIR}/release/packages/kernel.ucl \
> ${DESTDIR}/${DISTDIR}/kernel-${flavor}.ucl ; \ > ${DESTDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}-${flavor}.ucl ; \
awk -F\" ' \ awk -F\" ' \
/name/ { printf("===> Creating %s-", $$2); next } \ /name/ { printf("===> Creating %s-", $$2); next } \
/version/ {print $$2; next } ' \ /version/ {print $$2; next } ' \
${DESTDIR}/${DISTDIR}/kernel-${flavor}.ucl ; \ ${DESTDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}-${flavor}.ucl ; \
pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh \ pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh \
create -M ${DESTDIR}/${DISTDIR}/kernel-${flavor}.ucl \ create -M ${DESTDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}-${flavor}.ucl \
-p ${DESTDIR}/${DISTDIR}/kernel-${flavor}.plist \ -p ${DESTDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}-${flavor}.plist \
-r ${DESTDIR}/${DISTDIR} \ -r ${DESTDIR}/${DISTDIR} \
-o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION}
.endfor .endfor