Page MenuHomeFreeBSD
Differential D24996

linuxkpi: Add kstrtou16
ClosedPublic
Actions

Authored by manu on May 25 2020, 9:07 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 14, 9:34 AM
Unknown Object (File)
Mon, Apr 14, 4:11 AM
Unknown Object (File)
Mon, Apr 14, 2:00 AM
Unknown Object (File)
Sun, Apr 13, 10:30 PM
Unknown Object (File)
Sun, Apr 13, 8:55 PM
Unknown Object (File)
Mon, Apr 7, 11:10 PM
Unknown Object (File)
Sun, Apr 6, 6:22 AM
Unknown Object (File)
Wed, Mar 26, 5:37 PM
View All 61 Files
Subscribers
imp

Details

Reviewers
• hselasky
emaste
Commits
rS361551: linuxkpi: Add kstrtou16
Summary

This function convert a char * to a u16.
Simply use strtoul and cast to compare for ERANGE

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

manu created this revision.May 25 2020, 9:07 AM
Herald added a subscriber: imp. · View Herald TranscriptMay 25 2020, 9:07 AM
manu requested review of this revision.May 25 2020, 9:07 AM
manu added a comment.May 27 2020, 9:32 AM

ping

• hselasky added inline comments.May 27 2020, 9:51 AM
sys/compat/linuxkpi/common/include/linux/kernel.h
380

temp should be unsigned long. Else the point of comparing temp != (u16)temp goes away,.

• hselasky added inline comments.May 27 2020, 9:55 AM
sys/compat/linuxkpi/common/include/linux/kernel.h
382

And also the (u16) cast should be removed.

manu updated this revision to Diff 72310.May 27 2020, 10:00 AM
manu edited the summary of this revision. (Show Details)
manu marked 2 inline comments as done.May 27 2020, 10:03 AM
• hselasky accepted this revision.May 27 2020, 10:18 AM
This revision is now accepted and ready to land.May 27 2020, 10:18 AM
Closed by commit rS361551: linuxkpi: Add kstrtou16 (authored by manu). · Explain WhyMay 27 2020, 11:42 AM
This revision was automatically updated to reflect the committed changes.
manu added a commit: rS361551: linuxkpi: Add kstrtou16.
manu mentioned this in rS364672: MFC r361450, r361452, r361550-r361551.Aug 24 2020, 1:14 PM

Revision Contents
Changeset List

PathSize
sys/
compat/
linuxkpi/
common/
include/
linux/
18 lines

Diff 72310

View Options

sys/compat/linuxkpi/common/include/linux/kernel.h

# Created by: anholt@FreeBSD.org # Created by: anholt@FreeBSD.org
# $FreeBSD$ # $FreeBSD$
PORTNAME= paraview PORTNAME= paraview
PORTVERSION= 5.2.0 DISTVERSION= 5.2.0
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= science graphics CATEGORIES= science graphics
MASTER_SITES= http://www.paraview.org/files/v${VERMAJORMINOR}/ MASTER_SITES= http://www.paraview.org/files/v${VERMAJORMINOR}/
DISTNAME= ParaView-v${PORTVERSION} DISTNAME= ParaView-v${PORTVERSION}
MAINTAINER= devel@stasyan.com MAINTAINER= devel@stasyan.com
COMMENT= Powerful scientific data visualization application COMMENT= Powerful scientific data visualization application
LICENSE= ParaView_License_1.2 LICENSE= ParaView_License_1.2
LICENSE_NAME= ParaView_License LICENSE_NAME= ParaView_License
LICENSE_FILE= ${PATCH_WRKSRC}/License_v1.2.txt LICENSE_FILE= ${PATCH_WRKSRC}/License_v1.2.txt
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:math/py-matplotlib BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:math/py-matplotlib@${PY_FLAVOR}
LIB_DEPENDS= libhdf5.so:science/hdf5 \ LIB_DEPENDS= libhdf5.so:science/hdf5 \
libpng.so:graphics/png \ libpng.so:graphics/png \
libtiff.so:graphics/tiff \ libtiff.so:graphics/tiff \
libfreetype.so:print/freetype2 \ libfreetype.so:print/freetype2 \
libexpat.so:textproc/expat2 \ libexpat.so:textproc/expat2 \
libjbig.so:graphics/jbigkit \ libjbig.so:graphics/jbigkit \
liborc-0.4.so:devel/orc \ liborc-0.4.so:devel/orc \
libpcre.so:devel/pcre \ libpcre.so:devel/pcre \
libffi.so:devel/libffi \ libffi.so:devel/libffi \
libdrm.so:graphics/libdrm \ libdrm.so:graphics/libdrm \
libfontconfig.so:x11-fonts/fontconfig libfontconfig.so:x11-fonts/fontconfig
RUN_DEPENDS= bash:shells/bash \ RUN_DEPENDS= bash:shells/bash \
${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:math/py-matplotlib ${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:math/py-matplotlib
jrmUnsubmitted
Not Done
Inline Actions

Should this have the flavor-foo for the python version? Should this be done now or should the focus be only on fixing the build issue?

jrm: Should this have the flavor-foo for the python version? Should this be done now or should the…
matUnsubmitted
Not Done
Inline Actions

It must, yes. Add @${PY_FLAVOR}.

mat: It must, yes. Add `@${PY_FLAVOR}`.
CONFLICTS_BUILD= protobuf* CONFLICTS_BUILD= protobuf*
USES= alias desktop-file-utils cmake:outsource jpeg python:2.7 shebangfix
USE_QT4= qmake_build moc_build rcc_build uic_build \ USE_QT4= qmake_build moc_build rcc_build uic_build \
linguisttools_build assistant_run qt3support \ linguisttools_build assistant_run qt3support \
corelib dbus designer gui help-tools network script \ corelib dbus designer gui help-tools network script \
sql svg xml webkit assistantclient clucene \ sql svg xml webkit assistantclient clucene \
xmlpatterns xmlpatterns-tool help xmlpatterns xmlpatterns-tool help
USE_GL= gl USE_GL= gl glu
USE_XORG= x11 xt xext ice xdmcp xau xcb xfixes xdamage xxf86vm xrender sm USE_XORG= x11 xt xext ice xdmcp xau xcb xfixes xdamage xxf86vm xrender sm dri3proto
USE_LDCONFIG= yes USE_LDCONFIG= yes
USE_GSTREAMER= yes USE_GSTREAMER= yes
USES= alias desktop-file-utils cmake:outsource jpeg python:2.7 shebangfix
INSTALLS_ICONS= yes INSTALLS_ICONS= yes
CMAKE_ARGS+= -DBUILD_SHARED_LIBS="ON" \ CMAKE_ARGS+= -DBUILD_SHARED_LIBS="ON" \
-DVTK_USE_SYSTEM_PNG="ON" \ -DVTK_USE_SYSTEM_PNG="ON" \
-DVTK_USE_SYSTEM_JPEG="ON" \ -DVTK_USE_SYSTEM_JPEG="ON" \
-DVTK_USE_SYSTEM_TIFF="ON" \ -DVTK_USE_SYSTEM_TIFF="ON" \
-DVTK_USE_SYSTEM_ZLIB="ON" \ -DVTK_USE_SYSTEM_ZLIB="ON" \
-DVTK_USE_SYSTEM_FREETYPE="ON" \ -DVTK_USE_SYSTEM_FREETYPE="ON" \
Show All 24 Lines
OSMESA_DESC= Use Mesa for off-screen rendering OSMESA_DESC= Use Mesa for off-screen rendering
GL2PS_DESC= Install support conversion OpenGL to PostScript GL2PS_DESC= Install support conversion OpenGL to PostScript
# VTKMPEG2 "Install patented MPEG2 encoder module" Off \ # VTKMPEG2 "Install patented MPEG2 encoder module" Off \
VERMAJORMINOR= ${PORTVERSION:R} VERMAJORMINOR= ${PORTVERSION:R}
.include <bsd.port.options.mk> .include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MOSMESA} .if ${PORT_OPTIONS:MOSMESA}
LIB_DEPENDS+= libOSMesa32.so:graphics/libosmesa LIB_DEPENDS+= libOSMesa32.so:graphics/libosmesa
CMAKE_ARGS+= -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \ CMAKE_ARGS+= -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
-DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \ -DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \
-DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa32.so -DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa32.so
.endif .endif
.if ${PORT_OPTIONS:MGL2PS} .if ${PORT_OPTIONS:MGL2PS}
LIB_DEPENDS+= libgl2ps.so:print/gl2ps LIB_DEPENDS+= libgl2ps.so:print/gl2ps
CMAKE_ARGS+= -DVTK_USE_GL2PS:BOOL=ON CMAKE_ARGS+= -DVTK_USE_GL2PS:BOOL=ON
PLIST_SUB+= GL2PS="" PLIST_SUB+= GL2PS=""
.else .else
PLIST_SUB+= GL2PS="@comment " PLIST_SUB+= GL2PS="@comment "
.endif .endif
jrmUnsubmitted
Not Done
Inline Actions

For future work, these could be converted to option helpers.

jrm: For future work, these could be converted to option helpers.
PLIST_SUB+= VERMAJORMINOR=${VERMAJORMINOR} PLIST_SUB+= VERMAJORMINOR=${VERMAJORMINOR}
CMAKE2INST= ParaViewConfig.cmake \ CMAKE2INST= ParaViewConfig.cmake \
cmake_install.cmake cmake_install.cmake
LIB_INSTDIR= ${PREFIX}/lib/${PORTNAME}-${VERMAJORMINOR} LIB_INSTDIR= ${PREFIX}/lib/${PORTNAME}-${VERMAJORMINOR}
pre-configure: pre-configure:
${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \ @${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
${PATCH_WRKSRC}/VTK/IO/Image/vtkPNGReader.cxx ${PATCH_WRKSRC}/VTK/IO/Image/vtkPNGReader.cxx
${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' \ @${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' \
${PATCH_WRKSRC}/VTK/Utilities/Maintenance/vtk_site_history.py ${PATCH_WRKSRC}/VTK/Utilities/Maintenance/vtk_site_history.py
post-install: post-install:
.for c2f in ${CMAKE2INST} .for c2f in ${CMAKE2INST}
${SED} -e 's|${BUILD_WRKSRC}|${LIB_INSTDIR}|g' \ ${SED} -e 's|${BUILD_WRKSRC}|${LIB_INSTDIR}|g' \
-e 's|${PATCH_WRKSRC}|${LIB_INSTDIR}|g' \ -e 's|${PATCH_WRKSRC}|${LIB_INSTDIR}|g' \
${BUILD_WRKSRC}/${c2f} > ${STAGEDIR}${LIB_INSTDIR}/`${BASENAME} ${c2f}` ${BUILD_WRKSRC}/${c2f} > ${STAGEDIR}${LIB_INSTDIR}/`${BASENAME} ${c2f}`
.endfor .endfor
${INSTALL_DATA} ${PATCH_WRKSRC}/CMake/UseParaView.cmake \ ${INSTALL_DATA} ${PATCH_WRKSRC}/CMake/UseParaView.cmake \
${STAGEDIR}${PREFIX}/lib/${PORTNAME}-${VERMAJORMINOR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}-${VERMAJORMINOR}
.include <bsd.port.mk> .include <bsd.port.mk>