Skip to content

Commit

Permalink
merged with master
Browse files Browse the repository at this point in the history
  • Loading branch information
schubi2 committed Jun 2, 2016
2 parents 9d15cfd + ef50436 commit 52ae8d8
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 28 deletions.
2 changes: 1 addition & 1 deletion SUBDIRS
@@ -1 +1 @@
src doc startup control autoyast_desktop test
src startup control autoyast_desktop test
6 changes: 0 additions & 6 deletions doc/Makefile.am

This file was deleted.

17 changes: 17 additions & 0 deletions doc/SELF_UPDATE.md
Expand Up @@ -60,6 +60,23 @@ The URL can contain a variable `$arch` that will be replaced by the system's
architecture, such as `x86_64`, `s390x`, etc. You can find more information
in the [Arch module](http://www.rubydoc.info/github/yast/yast-yast2/Yast/ArchClass).

### Actual URLs

The regular update URLs have the form
`https://updates.suse.com/SUSE/Updates/$PRODUCT/$VERSION/$ARCH/update` where
- PRODUCT is like OpenStack-Cloud, SLE-DESKTOP, SLE-SDK, SLE-SERVER,
- VERSION (for SLE-SERVER) is like 12, 12-SP1,
- ARCH is one of aarch64 i586 ia64 ppc ppc64 ppc64le s390x x86_64

For the self-update the *PRODUCT* is replaced
with *PRODUCT*-INSTALLER, producing these repository paths
under https://updates.suse.com/
- /SUSE/Updates/SLE-DESKTOP-INSTALLER/12-SP2/x86_64/update
- /SUSE/Updates/SLE-SERVER-INSTALLER/12-SP2/aarch64/update
- /SUSE/Updates/SLE-SERVER-INSTALLER/12-SP2/ppc64le/update
- /SUSE/Updates/SLE-SERVER-INSTALLER/12-SP2/s390x/update
- /SUSE/Updates/SLE-SERVER-INSTALLER/12-SP2/x86_64/update

## Security

Updates signatures will be checked by libzypp. If the signature is not
Expand Down
3 changes: 0 additions & 3 deletions doc/autodocs/Makefile.am

This file was deleted.

8 changes: 7 additions & 1 deletion package/yast2-installation.changes
@@ -1,8 +1,14 @@
-------------------------------------------------------------------
Wed Jun 1 11:45:00 UTC 2016 - schubi@suse.de
Thu Jun 2 11:09:33 UTC 2016 - schubi@suse.de

- AutoYaST support for ssh_import module.
Fate#319624
- 3.1.193

-------------------------------------------------------------------
Thu Jun 2 10:09:33 UTC 2016 - igonzalezsosa@suse.com

- Drop yast2-installation-devel-doc package (fate#320356)
- 3.1.192

-------------------------------------------------------------------
Expand Down
18 changes: 1 addition & 17 deletions package/yast2-installation.spec
Expand Up @@ -17,7 +17,7 @@


Name: yast2-installation
Version: 3.1.192
Version: 3.1.193
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
Expand Down Expand Up @@ -129,20 +129,9 @@ PreReq: %fillup_prereq

BuildArch: noarch

%package devel-doc
Group: Documentation/HTML
Requires: yast2-installation >= 2.15.34

PreReq: %fillup_prereq

Summary: YaST2 - Installation Parts

%description
System installation code as present on installation media.

%description devel-doc
System installation code as present on installation media.

%prep
%setup -n %{name}-%{version}

Expand Down Expand Up @@ -230,8 +219,3 @@ systemctl enable YaST2-Firstboot.service

%dir %{yast_docdir}
%{yast_docdir}/COPYING

%files devel-doc
%defattr(-,root,root)
%doc %{yast_docdir}
%exclude %{yast_docdir}/COPYING

0 comments on commit 52ae8d8

Please sign in to comment.