| From b55cc396ce1a8e9e3961e8ad350a034ac5161348 Mon Sep 17 00:00:00 2001 |
| From: Howard McLauchlan <hmclauchlan@fb.com> |
| Date: Tue, 16 Aug 2022 21:48:38 -0700 |
| Subject: [PATCH 1/3] Shuffle GetPassPhrase{.h, .cpp} in makefile.am |
| |
| Moving GetPassPhrase.o down into SEDUTIL_LINUX_CODE, since we need it |
| for the securemode/password-setting work. |
| |
| This is fine since AFAICT linuxpba_SOURCES eventually gets consumed in |
| conjunction with SEDUTIL_LINUX_CODE, so that binary will get access to |
| the TU. |
| |
| Keeping this as seperate commit since it might be a little bit subtle / |
| weird, depending on what Make is doing behind the scenes. |
| |
| Signed-off-by: Howard McLauchlan <hmclauchlan@fb.com> |
| --- |
| Makefile.am | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/Makefile.am b/Makefile.am |
| index 6656d59..82c5101 100644 |
| --- a/Makefile.am |
| +++ b/Makefile.am |
| @@ -28,7 +28,8 @@ SEDUTIL_LINUX_CODE = \ |
| linux/Version.h linux/os.h linux/DtaDevLinuxDrive.h \ |
| linux/DtaDevLinuxNvme.cpp linux/DtaDevLinuxSata.cpp \ |
| linux/DtaDevLinuxNvme.h linux/DtaDevLinuxSata.h \ |
| - linux/DtaDevOS.cpp linux/DtaDevOS.h |
| + linux/DtaDevOS.cpp linux/DtaDevOS.h \ |
| + LinuxPBA/GetPassPhrase.cpp LinuxPBA/GetPassPhrase.h |
| sbin_PROGRAMS = sedutil-cli linuxpba |
| sedutil_cli_SOURCES = Common/sedutil.cpp Common/DtaOptions.cpp \ |
| Common/DtaOptions.h \ |
| @@ -37,8 +38,7 @@ sedutil_cli_SOURCES = Common/sedutil.cpp Common/DtaOptions.cpp \ |
| CLEANFILES = linux/Version.h |
| BUILT_SOURCES = linux/Version.h |
| # |
| -linuxpba_SOURCES = LinuxPBA/LinuxPBA.cpp LinuxPBA/GetPassPhrase.cpp LinuxPBA/UnlockSEDs.cpp \ |
| - LinuxPBA/GetPassPhrase.h LinuxPBA/UnlockSEDs.h \ |
| +linuxpba_SOURCES = LinuxPBA/LinuxPBA.cpp LinuxPBA/UnlockSEDs.cpp LinuxPBA/UnlockSEDs.h \ |
| $(SEDUTIL_LINUX_CODE) \ |
| $(SEDUTIL_COMMON_CODE) |
| EXTRA_DIST = linux/GitVersion.sh linux/PSIDRevert_LINUX.txt linux/TestSuite.sh README.md docs/sedutil-cli.8 |
| -- |
| 2.40.0.577.gac1e443424-goog |
| |
