TDE
/
smartcardauth
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Labels Milestones

Improve processing of multiarch libraries location in scripts. #6

Merged
SlavekB merged 1 commits from feat/improve-multiarch into master 3 years ago
Conversation 3 Commits 1 Files Changed 2
SlavekB commented 3 years ago
Owner

Initramfs hook instead of a fixed list of libraries, it processes dependent libraries according to ldd. To copy libraries and configuration files, copy_file is used to ensure the copy of the symlinks and maintaining the original paths by multiarch location.

Initramfs hook instead of a fixed list of libraries, it processes dependent libraries according to ldd. To copy libraries and configuration files, copy_file is used to ensure the copy of the symlinks and maintaining the original paths by multiarch location.
SlavekB added 1 commit 3 years ago
9cb2f81b9d
Improve processing of multiarch libraries location in scripts.
SlavekB commented 3 years ago
Poster
Owner

Initramfs content difference example:

--- /tmp/initramfs-before       2021-09-01 16:28:18.897570667 +0000
+++ /tmp/initramfs-new  2021-09-02 09:22:54.332399719 +0000
@@ -12,6 +12,7 @@
 etc/ld.so.conf.d/fakeroot-powerpc64le-linux-gnu.conf
 etc/ld.so.conf.d/libc.conf
 etc/ld.so.conf.d/powerpc64le-linux-gnu.conf
+etc/libccid_Info.plist
 etc/modprobe.d
 etc/mtab
 etc/opensc
@@ -69,11 +70,6 @@
 usr/bin/udevadm
 usr/lib
 usr/lib/klibc-5WGTBFJFr8KFAM6U3FRvYn1T0Gc.so
-usr/lib/libgcc_s.so.1
-usr/lib/libncursesw.so.6
-usr/lib/libpcsclite.so.1
-usr/lib/libudev.so.1
-usr/lib/libusb-1.0.so.0
 usr/lib/modprobe.d
 usr/lib/modprobe.d/aliases.conf
 usr/lib/modprobe.d/fbdev-blacklist.conf
@@ -835,7 +831,6 @@
 usr/lib/modules/4.19.0-16-powerpc64le/modules.softdep
 usr/lib/modules/4.19.0-16-powerpc64le/modules.symbols
 usr/lib/modules/4.19.0-16-powerpc64le/modules.symbols.bin
-usr/lib/opensc-pkcs11.so
 usr/lib/pcsc
 usr/lib/pcsc/drivers
 usr/lib/pcsc/drivers/ifd-ccid.bundle
@@ -894,6 +889,8 @@
 usr/lib/powerpc64le-linux-gnu/libm.so.6
 usr/lib/powerpc64le-linux-gnu/libmount.so.1
 usr/lib/powerpc64le-linux-gnu/libmount.so.1.1.0
+usr/lib/powerpc64le-linux-gnu/libncursesw.so.6
+usr/lib/powerpc64le-linux-gnu/libncursesw.so.6.1
 usr/lib/powerpc64le-linux-gnu/libnettle.so.6
 usr/lib/powerpc64le-linux-gnu/libnettle.so.6.5
 usr/lib/powerpc64le-linux-gnu/libopensc.so.6
@@ -902,6 +899,8 @@
 usr/lib/powerpc64le-linux-gnu/libp11-kit.so.0.3.0
 usr/lib/powerpc64le-linux-gnu/libpcre.so.3
 usr/lib/powerpc64le-linux-gnu/libpcre.so.3.13.3
+usr/lib/powerpc64le-linux-gnu/libpcsclite.so.1
+usr/lib/powerpc64le-linux-gnu/libpcsclite.so.1.0.0
 usr/lib/powerpc64le-linux-gnu/libpkcs11-helper.so.1
 usr/lib/powerpc64le-linux-gnu/libpkcs11-helper.so.1.0.0
 usr/lib/powerpc64le-linux-gnu/libpthread-2.28.so
@@ -924,10 +923,13 @@
 usr/lib/powerpc64le-linux-gnu/libudev.so.1.6.13
 usr/lib/powerpc64le-linux-gnu/libunistring.so.2
 usr/lib/powerpc64le-linux-gnu/libunistring.so.2.1.0
+usr/lib/powerpc64le-linux-gnu/libusb-1.0.so.0
+usr/lib/powerpc64le-linux-gnu/libusb-1.0.so.0.1.0
 usr/lib/powerpc64le-linux-gnu/libuuid.so.1
 usr/lib/powerpc64le-linux-gnu/libuuid.so.1.3.0
 usr/lib/powerpc64le-linux-gnu/libz.so.1
 usr/lib/powerpc64le-linux-gnu/libz.so.1.2.11
+usr/lib/powerpc64le-linux-gnu/opensc-pkcs11.so
 usr/lib/systemd
 usr/lib/systemd/network
 usr/lib/systemd/network/99-default.link
Initramfs content difference example: ``` --- /tmp/initramfs-before 2021-09-01 16:28:18.897570667 +0000 +++ /tmp/initramfs-new 2021-09-02 09:22:54.332399719 +0000 @@ -12,6 +12,7 @@ etc/ld.so.conf.d/fakeroot-powerpc64le-linux-gnu.conf etc/ld.so.conf.d/libc.conf etc/ld.so.conf.d/powerpc64le-linux-gnu.conf +etc/libccid_Info.plist etc/modprobe.d etc/mtab etc/opensc @@ -69,11 +70,6 @@ usr/bin/udevadm usr/lib usr/lib/klibc-5WGTBFJFr8KFAM6U3FRvYn1T0Gc.so -usr/lib/libgcc_s.so.1 -usr/lib/libncursesw.so.6 -usr/lib/libpcsclite.so.1 -usr/lib/libudev.so.1 -usr/lib/libusb-1.0.so.0 usr/lib/modprobe.d usr/lib/modprobe.d/aliases.conf usr/lib/modprobe.d/fbdev-blacklist.conf @@ -835,7 +831,6 @@ usr/lib/modules/4.19.0-16-powerpc64le/modules.softdep usr/lib/modules/4.19.0-16-powerpc64le/modules.symbols usr/lib/modules/4.19.0-16-powerpc64le/modules.symbols.bin -usr/lib/opensc-pkcs11.so usr/lib/pcsc usr/lib/pcsc/drivers usr/lib/pcsc/drivers/ifd-ccid.bundle @@ -894,6 +889,8 @@ usr/lib/powerpc64le-linux-gnu/libm.so.6 usr/lib/powerpc64le-linux-gnu/libmount.so.1 usr/lib/powerpc64le-linux-gnu/libmount.so.1.1.0 +usr/lib/powerpc64le-linux-gnu/libncursesw.so.6 +usr/lib/powerpc64le-linux-gnu/libncursesw.so.6.1 usr/lib/powerpc64le-linux-gnu/libnettle.so.6 usr/lib/powerpc64le-linux-gnu/libnettle.so.6.5 usr/lib/powerpc64le-linux-gnu/libopensc.so.6 @@ -902,6 +899,8 @@ usr/lib/powerpc64le-linux-gnu/libp11-kit.so.0.3.0 usr/lib/powerpc64le-linux-gnu/libpcre.so.3 usr/lib/powerpc64le-linux-gnu/libpcre.so.3.13.3 +usr/lib/powerpc64le-linux-gnu/libpcsclite.so.1 +usr/lib/powerpc64le-linux-gnu/libpcsclite.so.1.0.0 usr/lib/powerpc64le-linux-gnu/libpkcs11-helper.so.1 usr/lib/powerpc64le-linux-gnu/libpkcs11-helper.so.1.0.0 usr/lib/powerpc64le-linux-gnu/libpthread-2.28.so @@ -924,10 +923,13 @@ usr/lib/powerpc64le-linux-gnu/libudev.so.1.6.13 usr/lib/powerpc64le-linux-gnu/libunistring.so.2 usr/lib/powerpc64le-linux-gnu/libunistring.so.2.1.0 +usr/lib/powerpc64le-linux-gnu/libusb-1.0.so.0 +usr/lib/powerpc64le-linux-gnu/libusb-1.0.so.0.1.0 usr/lib/powerpc64le-linux-gnu/libuuid.so.1 usr/lib/powerpc64le-linux-gnu/libuuid.so.1.3.0 usr/lib/powerpc64le-linux-gnu/libz.so.1 usr/lib/powerpc64le-linux-gnu/libz.so.1.2.11 +usr/lib/powerpc64le-linux-gnu/opensc-pkcs11.so usr/lib/systemd usr/lib/systemd/network usr/lib/systemd/network/99-default.link ```
MicheleC commented 3 years ago
Owner

I can't test this, but the idea seems good. I think we can go ahead with this.

I can't test this, but the idea seems good. I think we can go ahead with this.
SlavekB commented 3 years ago
Poster
Owner

I looked into the older distribution and seems that copy_file is not available on older initramfs-tools versions. Therefore, I will do a new revision.

I looked into the older distribution and seems that `copy_file` is not available on older initramfs-tools versions. Therefore, I will do a new revision.
👍 1
SlavekB force-pushed feat/improve-multiarch from 9cb2f81b9d to 3eb77b4fca 3 years ago
SlavekB merged commit 3eb77b4fca into master 3 years ago
SlavekB deleted branch feat/improve-multiarch 3 years ago
SlavekB added this to the R14.0.11 release milestone 3 years ago
The pull request has been merged as 3eb77b4fca.
Sign in to join this conversation.
Reviewers
Request review
No reviewers
Labels
Apply labels
Clear labels
GE/need-info
General - need additional info from contributor PR/keep-branch
Pull request - do not delete branch after merging PR/not-ok
Pull request - need fixing PR/rfc
Pull request - request for comments PR/update-trans
Pull request - update to translation files needed PR/wip
Pull request - work in progress RS/R14.0.x
Related to R14.0.x series RS/R14.1.x
Related to R14.1.x series SL/critical
Severity level - critical SL/major
Severity level - major SL/minor
Severity level - minor SL/normal
Severity level - normal SL/regression
Severity level - regression from previous version SL/trivial
Severity level - trivial SL/wishlist
Severity level - wishlist request ST/duplicate
Status - duplicate of another issue ST/invalid
Status - invalid report ST/notourproblem
Status - not our problem ST/rejected
Status - rejected ST/wontfix
Status - won't fix ST/worksforme
Status - works for me, unable to reproduce
No Label GE/need-info PR/keep-branch PR/not-ok PR/rfc PR/update-trans PR/wip RS/R14.0.x RS/R14.1.x SL/critical SL/major SL/minor SL/normal SL/regression SL/trivial SL/wishlist ST/duplicate ST/invalid ST/notourproblem ST/rejected ST/wontfix ST/worksforme
Milestone
Set milestone
Clear milestone
No items
No Milestone
R14.0.11 release
Assignees
Assign users
Clear assignees
No Assignees
2 Participants
Notifications
Due Date

No due date set.

Dependencies

No dependencies set.

Reference: TDE/smartcardauth#6
Write Preview
Loading…
Cancel
Save
There is no content yet.
Delete Branch 'feat/improve-multiarch'

Deleting a branch is permanent. It CANNOT be undone. Continue?

No
Yes