Browse code
likewise-open: enable domain join to recognize photon
The latest Photon release file has "VMware Photon OS" instead of "VMware Photon Linux"
Change-Id: I6b2465b56f2c2db9aab7dae3559fafeccb4fb267
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6140
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6211
Reviewed-by: Sharath George
Tested-by: Sriram Nambakam <snambakam@vmware.com>
Sriram Nambakam authored on 2018/11/06 03:18:26Showing 2 changed files
- SPECS/likewise-open/0002-likewise-domainjoin-recognize-photon.patch
- SPECS/likewise-open/likewise-open.spec
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,22 @@ |
| 0 |
+--- a/domainjoin/libdomainjoin/src/djdistroinfo.c 2018-08-01 15:59:03.000000000 -0700 |
|
| 1 |
+@@ -142,6 +142,19 @@ |
|
| 2 |
+ 1 |
|
| 3 |
+ }, |
|
| 4 |
+ {
|
|
| 5 |
++ DISTRO_VMWARE_PHOTON, |
|
| 6 |
++ "/etc/photon-release", |
|
| 7 |
++ /* |
|
| 8 |
++ # The format of the line is something like: |
|
| 9 |
++ # VMware Photon OS 1.0 (x86_64) |
|
| 10 |
++ */ |
|
| 11 |
++ "^[[:space:]]*VMware Photon OS ([[:digit:]]+(\\.[[:digit:]]+)?)" |
|
| 12 |
++ "( \\(\\S+\\))?", |
|
| 13 |
++ 1, |
|
| 14 |
++ -1, |
|
| 15 |
++ 1 |
|
| 16 |
++ }, |
|
| 17 |
++ {
|
|
| 18 |
+ DISTRO_RHEL, |
|
| 19 |
+ "/etc/redhat-release", |
|
| 20 |
+ /* |
| ... | ... |
@@ -1,13 +1,14 @@ |
| 1 | 1 |
Name: likewise-open |
| 2 | 2 |
Summary: Likewise Open |
| 3 | 3 |
Version: 6.2.11.4 |
| 4 |
-Release: 3%{?dist}
|
|
| 4 |
+Release: 4%{?dist}
|
|
| 5 | 5 |
Group: Development/Libraries |
| 6 |
-Vendor: VMware, Inc. |
|
| 6 |
+Vendor: VMware, Inc. |
|
| 7 | 7 |
License: GPL 2.0,LGPL 2.1 |
| 8 | 8 |
URL: https://github.com/vmware/likewise-open |
| 9 | 9 |
Source0: %{name}-%{version}.tar.gz
|
| 10 | 10 |
%define sha1 likewise-open=6aa4cf11de6747d5f8940666c21adc3e1f7b6a4b |
| 11 |
+Patch0: 0002-likewise-domainjoin-recognize-photon.patch |
|
| 11 | 12 |
Distribution: Photon |
| 12 | 13 |
Requires: Linux-PAM |
| 13 | 14 |
Requires: (coreutils >= 8.22 or toybox) |
| ... | ... |
@@ -35,7 +36,7 @@ BuildRequires: sqlite-devel |
| 35 | 35 |
%package devel |
| 36 | 36 |
Summary: Likewise Open (development) |
| 37 | 37 |
Group: Development/Libraries |
| 38 |
-Requires: likewise-open = %{version}-%{release}
|
|
| 38 |
+Requires: likewise-open = %{version}-%{release}
|
|
| 39 | 39 |
|
| 40 | 40 |
%description |
| 41 | 41 |
Likewise Open 6.1 LWIS |
| ... | ... |
@@ -45,6 +46,7 @@ This package provides files for developing against the Likewise APIs |
| 45 | 45 |
|
| 46 | 46 |
%prep |
| 47 | 47 |
%setup -q |
| 48 |
+%patch0 -p1 |
|
| 48 | 49 |
|
| 49 | 50 |
%build |
| 50 | 51 |
# hack against glibc-2.26 to avoid getopt declaration mismatch |
| ... | ... |
@@ -261,7 +263,7 @@ fi |
| 261 | 261 |
%clean |
| 262 | 262 |
rm -rf %{buildroot}/*
|
| 263 | 263 |
|
| 264 |
-%files |
|
| 264 |
+%files |
|
| 265 | 265 |
%defattr(-,root,root) |
| 266 | 266 |
%exclude /etc/krb5.conf.default |
| 267 | 267 |
/opt/likewise/bin/* |
| ... | ... |
@@ -288,6 +290,8 @@ rm -rf %{buildroot}/*
|
| 288 | 288 |
/opt/likewise/lib64/pkgconfig/libedit.pc |
| 289 | 289 |
|
| 290 | 290 |
%changelog |
| 291 |
+* Mon Nov 5 2018 Sriram Nambakam <snambakam@vmware.com> 6.2.11.4-4 |
|
| 292 |
+- Change domain join to recognize Photon release and use systemctl |
|
| 291 | 293 |
* Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 6.2.11.4-3 |
| 292 | 294 |
- Requires coreutils/procps-ng or toybox, /bin/grep, /bin/sed |
| 293 | 295 |
* Thu Aug 24 2017 Alexey Makhalov <amakhalov@vmware.com> 6.2.11.4-2 |