diff options
| author | Zheng Wei <36897253+gzhwei@users.noreply.github.com> | 2018-05-03 13:53:47 -0700 |
|---|---|---|
| committer | Max Illfelder <illfelder@users.noreply.github.com> | 2018-05-03 13:53:47 -0700 |
| commit | c7b93f267789a62fb7672c78a8f29a0c594ecfe3 (patch) | |
| tree | cbb12c30f52424e8ae672c23fd1a82c400246049 | |
| parent | 181e464bd92c50bc3ac0cd354a399202e5469e53 (diff) | |
| download | google-compute-image-packages-c7b93f267789a62fb7672c78a8f29a0c594ecfe3.tar.gz | |
Add versioned lib file for libnss-oslogin-cache and fix build files. (#591)
5 files changed, 11 insertions, 7 deletions
diff --git a/google_compute_engine_oslogin/Makefile b/google_compute_engine_oslogin/Makefile index 6eb17e3..5f78099 100644 --- a/google_compute_engine_oslogin/Makefile +++ b/google_compute_engine_oslogin/Makefile @@ -7,7 +7,8 @@ MINOR = 3 REVISION = 0 LIBNSS_CACHE_OSLOGIN = libnss_cache_$(BASENAME) -LIBNSS_CACHE_OSLOGIN_NAME = $(LIBNSS_CACHE_OSLOGIN).so.2 +LIBNSS_CACHE_OSLOGIN_NAME = libnss_cache_$(NAME)-$(MAJOR).$(MINOR).$(REVISION).so +LIBNSS_CACHE_OSLOGIN_SONAME = $(LIBNSS_CACHE_OSLOGIN).so.2 NSS_LIBRARY_NAME = libnss_$(NAME)-$(MAJOR).$(MINOR).$(REVISION).so NSS_LIBRARY_SONAME = libnss_$(BASENAME).so.2 NSS_INSTALL_PATH = /lib @@ -23,7 +24,7 @@ CC ?= gcc PAMFLAGS = $(LDFLAGS) $(INCLUDE_FLAGS) -shared NSSFLAGS = $(LDFLAGS) $(INCLUDE_FLAGS) -shared -Wl,-soname,$(NSS_LIBRARY_SONAME) LIBNSSFLAGS = $(LDFLAGS) -Wall -Wstrict-prototypes -fPIC -LIBNSS_SO_FLAGS = $(LIBNSSFLAGS) -shared -Wl,-soname,$(LIBNSS_CACHE_OSLOGIN_NAME) +LIBNSS_SO_FLAGS = $(LIBNSSFLAGS) -shared -Wl,-soname,$(LIBNSS_CACHE_OSLOGIN_SONAME) # UTILS UTILS_DIR = utils @@ -134,9 +135,9 @@ $(SELINUX_MODULE): $(SELINUX_MOD_FILE) ifdef INSTALL_SELINUX -install: $(NSS_LIBRARY_NAME) $(PAM_ADMIN_MOD) $(PAM_LOGIN_MOD) $(AUTHKEYS_BIN) $(NSS_CACHE_BIN) $(SELINUX_MODULE) +install: $(NSS_LIBRARY_NAME) $(LIBNSS_OSLOGIN_CACHE_NAME) $(PAM_ADMIN_MOD) $(PAM_LOGIN_MOD) $(AUTHKEYS_BIN) $(NSS_CACHE_BIN) $(SELINUX_MODULE) else -install: $(NSS_LIBRARY_NAME) $(PAM_ADMIN_MOD) $(PAM_LOGIN_MOD) $(AUTHKEYS_BIN) $(NSS_CACHE_BIN) +install: $(NSS_LIBRARY_NAME) $(LIBNSS_OSLOGIN_CACHE_NAME) $(PAM_ADMIN_MOD) $(PAM_LOGIN_MOD) $(AUTHKEYS_BIN) $(NSS_CACHE_BIN) endif mkdir -p $(DESTDIR)$(PREFIX)/$(NSS_INSTALL_PATH) mkdir -p $(DESTDIR)$(PREFIX)/$(PAM_INSTALL_PATH) diff --git a/google_compute_engine_oslogin/README.md b/google_compute_engine_oslogin/README.md index c6a2547..4e9a19d 100644 --- a/google_compute_engine_oslogin/README.md +++ b/google_compute_engine_oslogin/README.md @@ -193,7 +193,7 @@ production quality._ the code directory.) 1. To build the package, run the command ``` - debbuild -us -uc + debuild -us -uc ``` #### RPM diff --git a/google_compute_engine_oslogin/packaging/debian8/google-compute-engine-oslogin.links b/google_compute_engine_oslogin/packaging/debian8/google-compute-engine-oslogin.links index 9cd9c44..9eee787 100644 --- a/google_compute_engine_oslogin/packaging/debian8/google-compute-engine-oslogin.links +++ b/google_compute_engine_oslogin/packaging/debian8/google-compute-engine-oslogin.links @@ -1 +1,2 @@ -/lib/libnss_google-compute-engine-oslogin-1.3.0.so /lib/libnss_oslogin.so.2 /lib/libnss_oslogin_cache.so.2 +/lib/libnss_google-compute-engine-oslogin-1.3.0.so /lib/libnss_oslogin.so.2 +/lib/libnss_cache_google-compute-engine-oslogin-1.3.0.so /lib/libnss_cache_oslogin.so.2 diff --git a/google_compute_engine_oslogin/packaging/debian9/google-compute-engine-oslogin.links b/google_compute_engine_oslogin/packaging/debian9/google-compute-engine-oslogin.links index 9cd9c44..9eee787 100644 --- a/google_compute_engine_oslogin/packaging/debian9/google-compute-engine-oslogin.links +++ b/google_compute_engine_oslogin/packaging/debian9/google-compute-engine-oslogin.links @@ -1 +1,2 @@ -/lib/libnss_google-compute-engine-oslogin-1.3.0.so /lib/libnss_oslogin.so.2 /lib/libnss_oslogin_cache.so.2 +/lib/libnss_google-compute-engine-oslogin-1.3.0.so /lib/libnss_oslogin.so.2 +/lib/libnss_cache_google-compute-engine-oslogin-1.3.0.so /lib/libnss_cache_oslogin.so.2 diff --git a/google_compute_engine_oslogin/packaging/rpmbuild/SPECS/google-compute-engine-oslogin.spec b/google_compute_engine_oslogin/packaging/rpmbuild/SPECS/google-compute-engine-oslogin.spec index 939b8ab..2a9dfe0 100644 --- a/google_compute_engine_oslogin/packaging/rpmbuild/SPECS/google-compute-engine-oslogin.spec +++ b/google_compute_engine_oslogin/packaging/rpmbuild/SPECS/google-compute-engine-oslogin.spec @@ -51,6 +51,7 @@ make install DESTDIR=%{buildroot} NSS_INSTALL_PATH=/%{_lib} PAM_INSTALL_PATH=%{p %files %doc /%{_lib}/libnss_%{name}-%{version}.so +/%{_lib}/libnss_cache_%{name}-%{version}.so %{pam_install_path}/pam_oslogin_admin.so %{pam_install_path}/pam_oslogin_login.so /usr/bin/google_authorized_keys |