-
Notifications
You must be signed in to change notification settings - Fork 86
ci: bundle ccid drivers for keycard usb support #18196
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Conversation
Jenkins Builds
|
3f812b0
to
f5d5620
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I hate everything about scripts/init_app_dir.sh
.
&& cd builddir \ | ||
&& ninja \ | ||
&& ninja install \ | ||
&& cd /tmp \ | ||
&& wget https://ccid.apdu.fr/files/ccid-1.6.2.tar.xz \ | ||
&& tar -xJf ccid-1.6.2.tar.xz \ | ||
&& cd ccid-1.6.2 \ | ||
&& meson setup builddir \ | ||
--prefix=/usr \ | ||
&& cd builddir \ | ||
&& meson compile \ | ||
&& meson install \ | ||
&& ldconfig \ | ||
&& cd / \ | ||
&& rm -rf /tmp/pcsc-lite* \ | ||
&& rm -rf /tmp/pcsc-lite* /tmp/ccid* \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are we mixing build steps into installation step? What is this clusterfuck?
|
||
# Debug: Check if drivers are present | ||
echo "Checking for CCID drivers in ${APPDIR}/usr/lib/pcsc/drivers:" | ||
ls -la "${APPDIR}/usr/lib/pcsc/drivers/" || echo "No drivers directory found" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this be a failure?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I made this PR to get more info from failure in frank's system
else | ||
mkdir -p "${APP_DIR}"/usr/lib/{gstreamer1.0,gstreamer-1.0,nss} | ||
mkdir -p "${APP_DIR}"/usr/libexec | ||
|
||
echo "${GST_PLUGIN_SYSTEM_PATH_1_0}" | tr ':' '\n' | sort -u | xargs -I {} find {} -name "*.so" | xargs -I {} cp {} "${APP_DIR}/usr/lib/gstreamer-1.0/" | ||
echo "${GST_PLUGIN_SYSTEM_PATH_1_0}" | tr ':' '\n' | sort -u | xargs -I {} find {} -name "*.so" | grep -v "\.so\." | xargs -I {} cp {} "${APP_DIR}/usr/lib/gstreamer-1.0/" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What? Why are we first using -name "*.so"
in find
and then using grep -v "\.so\."
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes this is a mistake, i will revert
if [ -d "/usr/lib/pcsc/drivers" ]; then | ||
cp -r /usr/lib/pcsc/drivers/* "${APP_DIR}/usr/lib/pcsc/drivers/" | ||
echo "CCID drivers copied successfully" | ||
ls -la "${APP_DIR}/usr/lib/pcsc/drivers/" | ||
else | ||
echo "No CCID drivers found at /usr/lib/pcsc/drivers" | ||
fi | ||
|
||
if [ -f "/usr/lib/x86_64-linux-gnu/libccid.so" ]; then | ||
cp -L /usr/lib/x86_64-linux-gnu/libccid.so* "${APP_DIR}/usr/lib/" || true | ||
fi |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this in if
clauses? Shouldn't it fail if it can't find them?
I didn't make this PR for review yet, made it to get a build and to test ccid drivers bundling. |
I just tried the Linux build and I still have these logs at the top
|
Summary