mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-15 12:54:27 +00:00
Revert "pkgbase: Create a FreeBSD-dtb package"
Somehow this doesn't work iwth make packages due to some kind of a race.
The package is first created correctly but later in the process it is
overwritten by a badly created empty package.
Revert in the mean time so we can have working pkgbase on arm/arm64
This reverts commit a5afd7920d
.
This commit is contained in:
parent
22d12caad6
commit
9bbe06b004
|
@ -2178,35 +2178,9 @@ _default_flavor= -default
|
|||
. if ${MK_DEBUG_FILES} != "no"
|
||||
_debug=-dbg
|
||||
. endif
|
||||
|
||||
create-dtb-package:
|
||||
@if [ -f ${KSTAGEDIR}/${DISTDIR}/dtb.plist ]; then \
|
||||
sed -e "s/%VERSION%/${PKG_VERSION}/" \
|
||||
-e "s/%PKGNAME%/dtb/" \
|
||||
-e "s/%COMMENT%/FreeBSD Devicetree Blobs/" \
|
||||
-e "s/%DESC%/FreeBSD Devicetree Blobs/" \
|
||||
-e "s/ %VCS_REVISION%/${VCS_REVISION}/" \
|
||||
-e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \
|
||||
-e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \
|
||||
-e "s|%PKG_WWW%|${PKG_WWW}|" \
|
||||
${SRCDIR}/release/packages/dtb.ucl \
|
||||
> ${KSTAGEDIR}/${DISTDIR}/dtb.ucl ; \
|
||||
awk -F\" ' \
|
||||
/name/ { printf("===> Creating %s-", $$2); next } \
|
||||
/version/ {print $$2; next } ' \
|
||||
${KSTAGEDIR}/${DISTDIR}/dtb.ucl ; \
|
||||
${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \
|
||||
-o OSVERSION="${SRCRELDATE}" \
|
||||
create -f ${PKG_FORMAT} \
|
||||
-M ${KSTAGEDIR}/${DISTDIR}/dtb.ucl \
|
||||
-p ${KSTAGEDIR}/${DISTDIR}/dtb.plist \
|
||||
-r ${KSTAGEDIR}/${DISTDIR} \
|
||||
-o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} ; \
|
||||
fi
|
||||
|
||||
create-kernel-packages: .PHONY
|
||||
. for flavor in "" ${_debug}
|
||||
create-kernel-packages: create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},} create-dtb-package
|
||||
create-kernel-packages: create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}
|
||||
create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap .PHONY
|
||||
@cd ${KSTAGEDIR}/${DISTDIR} ; \
|
||||
${METALOG_SORT_CMD} ${KSTAGEDIR}/kernel.meta | \
|
||||
|
|
|
@ -1,16 +0,0 @@
|
|||
#
|
||||
#
|
||||
|
||||
name = "%PKG_NAME_PREFIX%-%PKGNAME%"
|
||||
origin = "base"
|
||||
version = "%VERSION%"
|
||||
comment = "%COMMENT%"
|
||||
categories = [ base ]
|
||||
maintainer = "%PKG_MAINTAINER%"
|
||||
www = "%PKG_WWW%"
|
||||
prefix = "/"
|
||||
licenselogic = "single"
|
||||
licenses = [ BSD2CLAUSE ]
|
||||
desc = <<EOD
|
||||
%DESC%
|
||||
EOD
|
|
@ -23,13 +23,9 @@
|
|||
}
|
||||
}
|
||||
if (kernel != "") {
|
||||
if ($1 ~ /^\/boot\/dtb\//) {
|
||||
tags="package=dtb"
|
||||
} else {
|
||||
tags="package=kernel"
|
||||
if (_kernconf != "") {
|
||||
tags=tags""_kernconf
|
||||
}
|
||||
tags="package=kernel"
|
||||
if (_kernconf != "") {
|
||||
tags=tags""_kernconf
|
||||
}
|
||||
}
|
||||
if (length(tags) == 0)
|
||||
|
@ -40,12 +36,8 @@
|
|||
for (i in a) {
|
||||
if (a[i] ~ /^package=/) {
|
||||
pkgname=a[i]
|
||||
if ($1 ~ /^\/boot\//) {
|
||||
if ($1 ~ /^\/boot\/dtb\//)
|
||||
pkgname="dtb"
|
||||
else
|
||||
pkgname="bootloader"
|
||||
}
|
||||
if ($1 ~ /^\/boot\//)
|
||||
pkgname="bootloader"
|
||||
gsub(/package=/, "", pkgname)
|
||||
} else if (a[i] == "config") {
|
||||
type="config"
|
||||
|
@ -72,7 +64,7 @@
|
|||
print "No packages specified in line: $0"
|
||||
next
|
||||
}
|
||||
if (kernel != "" && pkgname != "dtb") {
|
||||
if (kernel != "") {
|
||||
output="kernel"
|
||||
if (_kernconf != "") {
|
||||
output=output"."_kernconf
|
||||
|
|
Loading…
Reference in a new issue