Page MenuHomeFreeBSD
Differential D37560

stand/ofw: Refactor ofw parsedev
ClosedPublic
Actions

Authored by imp on Nov 29 2022, 9:45 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Mar 6, 4:15 PM
Unknown Object (File)
Wed, Feb 26, 9:30 AM
Unknown Object (File)
Wed, Feb 26, 7:51 AM
Unknown Object (File)
Wed, Feb 26, 7:22 AM
Unknown Object (File)
Wed, Feb 26, 3:56 AM
Unknown Object (File)
Wed, Feb 26, 1:34 AM
Unknown Object (File)
Mon, Feb 24, 7:59 PM
Unknown Object (File)
Jan 26 2025, 10:05 AM
View All 66 Files
Subscribers
dab

Details

Reviewers
kevans
manu
Commits
rG7ece24fe1680: stand/ofw: Refactor ofw parsedev
rGf9ce8da86434: stand/ofw: Refactor ofw parsedev
Summary

Both ofw_disk and ofw_net use the same parsedev routine, except for the
string passed in to match the ofw device node's type. Create a routine
to do that and connect these two users up to that.

Sponsored by: Netflix

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
stand/
libofw/
23 lines
2 lines
18 lines
18 lines

Diff 113721

View Options

stand/libofw/devicename.c

Show All 22 Lines
. elif ${pkgconfig_ARGS} == "both" . elif ${pkgconfig_ARGS} == "both"
CONFIGURE_ENV+= PKG_CONFIG=pkgconf CONFIGURE_ENV+= PKG_CONFIG=pkgconf
BUILD_DEPENDS+= ${_PKGCONFIG_DEPENDS} BUILD_DEPENDS+= ${_PKGCONFIG_DEPENDS}
RUN_DEPENDS+= ${_PKGCONFIG_DEPENDS} RUN_DEPENDS+= ${_PKGCONFIG_DEPENDS}
. else . else
IGNORE= USES=pkgconfig - invalid args: [${pkgconfig_ARGS}] specified IGNORE= USES=pkgconfig - invalid args: [${pkgconfig_ARGS}] specified
. endif . endif
_USES_POST+= pkgconfig
.endif
.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_PKGCONFIG_POST_MK)
_INCLUDE_USES_PKGCONFIG_POST_MK=yes
# Provide a cooperative mechanism for managing PKG_CONFIG_PATH.
. if defined(PKGCONFIG_PATHS)
. if !${CONFIGURE_ENV:MPKG_CONFIG_PATH=*} && !${MAKE_ENV:MPKG_CONFIG_PATH=*}
CONFIGURE_ENV+= PKG_CONFIG_PATH=${PKGCONFIG_PATHS:ts:}
MAKE_ENV+= PKG_CONFIG_PATH=${PKGCONFIG_PATHS:ts:}
. else
DEV_WARNING+= "PKGCONFIG_PATHS was ignored due to conflict with CONFIGURE_ENV or MAKE_ENV"
. endif
. endif
.endif .endif
View Options

stand/libofw/libofw.h

Show All 22 Lines
. elif ${pkgconfig_ARGS} == "both" . elif ${pkgconfig_ARGS} == "both"
CONFIGURE_ENV+= PKG_CONFIG=pkgconf CONFIGURE_ENV+= PKG_CONFIG=pkgconf
BUILD_DEPENDS+= ${_PKGCONFIG_DEPENDS} BUILD_DEPENDS+= ${_PKGCONFIG_DEPENDS}
RUN_DEPENDS+= ${_PKGCONFIG_DEPENDS} RUN_DEPENDS+= ${_PKGCONFIG_DEPENDS}
. else . else
IGNORE= USES=pkgconfig - invalid args: [${pkgconfig_ARGS}] specified IGNORE= USES=pkgconfig - invalid args: [${pkgconfig_ARGS}] specified
. endif . endif
_USES_POST+= pkgconfig
.endif
.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_PKGCONFIG_POST_MK)
_INCLUDE_USES_PKGCONFIG_POST_MK=yes
# Provide a cooperative mechanism for managing PKG_CONFIG_PATH.
. if defined(PKGCONFIG_PATHS)
. if !${CONFIGURE_ENV:MPKG_CONFIG_PATH=*} && !${MAKE_ENV:MPKG_CONFIG_PATH=*}
CONFIGURE_ENV+= PKG_CONFIG_PATH=${PKGCONFIG_PATHS:ts:}
MAKE_ENV+= PKG_CONFIG_PATH=${PKGCONFIG_PATHS:ts:}
. else
DEV_WARNING+= "PKGCONFIG_PATHS was ignored due to conflict with CONFIGURE_ENV or MAKE_ENV"
. endif
. endif
.endif .endif
View Options

stand/libofw/ofw_disk.c

Show All 22 Lines
. elif ${pkgconfig_ARGS} == "both" . elif ${pkgconfig_ARGS} == "both"
CONFIGURE_ENV+= PKG_CONFIG=pkgconf CONFIGURE_ENV+= PKG_CONFIG=pkgconf
BUILD_DEPENDS+= ${_PKGCONFIG_DEPENDS} BUILD_DEPENDS+= ${_PKGCONFIG_DEPENDS}
RUN_DEPENDS+= ${_PKGCONFIG_DEPENDS} RUN_DEPENDS+= ${_PKGCONFIG_DEPENDS}
. else . else
IGNORE= USES=pkgconfig - invalid args: [${pkgconfig_ARGS}] specified IGNORE= USES=pkgconfig - invalid args: [${pkgconfig_ARGS}] specified
. endif . endif
_USES_POST+= pkgconfig
.endif
.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_PKGCONFIG_POST_MK)
_INCLUDE_USES_PKGCONFIG_POST_MK=yes
# Provide a cooperative mechanism for managing PKG_CONFIG_PATH.
. if defined(PKGCONFIG_PATHS)
. if !${CONFIGURE_ENV:MPKG_CONFIG_PATH=*} && !${MAKE_ENV:MPKG_CONFIG_PATH=*}
CONFIGURE_ENV+= PKG_CONFIG_PATH=${PKGCONFIG_PATHS:ts:}
MAKE_ENV+= PKG_CONFIG_PATH=${PKGCONFIG_PATHS:ts:}
. else
DEV_WARNING+= "PKGCONFIG_PATHS was ignored due to conflict with CONFIGURE_ENV or MAKE_ENV"
. endif
. endif
.endif .endif
View Options

stand/libofw/ofw_net.c

Show All 22 Lines
. elif ${pkgconfig_ARGS} == "both" . elif ${pkgconfig_ARGS} == "both"
CONFIGURE_ENV+= PKG_CONFIG=pkgconf CONFIGURE_ENV+= PKG_CONFIG=pkgconf
BUILD_DEPENDS+= ${_PKGCONFIG_DEPENDS} BUILD_DEPENDS+= ${_PKGCONFIG_DEPENDS}
RUN_DEPENDS+= ${_PKGCONFIG_DEPENDS} RUN_DEPENDS+= ${_PKGCONFIG_DEPENDS}
. else . else
IGNORE= USES=pkgconfig - invalid args: [${pkgconfig_ARGS}] specified IGNORE= USES=pkgconfig - invalid args: [${pkgconfig_ARGS}] specified
. endif . endif
_USES_POST+= pkgconfig
.endif
.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_PKGCONFIG_POST_MK)
_INCLUDE_USES_PKGCONFIG_POST_MK=yes
# Provide a cooperative mechanism for managing PKG_CONFIG_PATH.
. if defined(PKGCONFIG_PATHS)
. if !${CONFIGURE_ENV:MPKG_CONFIG_PATH=*} && !${MAKE_ENV:MPKG_CONFIG_PATH=*}
CONFIGURE_ENV+= PKG_CONFIG_PATH=${PKGCONFIG_PATHS:ts:}
MAKE_ENV+= PKG_CONFIG_PATH=${PKGCONFIG_PATHS:ts:}
. else
DEV_WARNING+= "PKGCONFIG_PATHS was ignored due to conflict with CONFIGURE_ENV or MAKE_ENV"
. endif
. endif
.endif .endif