rpm/yast2-installation
SHA256
1
0
Fork 0
forked from pool/yast2-installation
Code Pull Requests Activity

Accepting request 87346 from YaST:Head

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/87346
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yast2-installation?expand=0&rev=221
This commit is contained in:
Lars Vogdt 2011-10-11 15:08:05 +00:00 committed by Git OBS Bridge
commit 7f0010a489
6 changed files with 81 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
YaST2-Firstboot.service
View File

@ -2,15 +2,12 @@
Description=YaST2 Firstboot Description=YaST2 Firstboot
After=apparmor.service local-fs.target YaST2-Second-Stage.service After=apparmor.service local-fs.target YaST2-Second-Stage.service
Before=getty@tty1.service xdm.service Before=getty@tty1.service xdm.service
ConditionPathExists=|/var/lib/YaST2/reconfig_system ConditionPathExists=/var/lib/YaST2/reconfig_system
ConditionPathExists=|/run/systemd/keep_running
[Service] [Service]
Type=oneshot Type=oneshot
ExecStartPre=/bin/touch /run/systemd/keep_running
ExecStart=/usr/lib/YaST2/startup/YaST2.Firstboot ExecStart=/usr/lib/YaST2/startup/YaST2.Firstboot
ExecStartPost=/bin/rm -f /var/lib/YaST2/reconfig_system ExecStartPost=/bin/rm -f /var/lib/YaST2/reconfig_system
ExecStartPost=/bin/rm -f /run/systemd/keep_running
TimeoutSec=0 TimeoutSec=0
RemainAfterExit=true RemainAfterExit=true

5
YaST2-Second-Stage.service
View File

@ -2,17 +2,14 @@
Description=YaST2 Second Stage Description=YaST2 Second Stage
After=apparmor.service local-fs.target After=apparmor.service local-fs.target
Before=getty@tty1.service xdm.service Before=getty@tty1.service xdm.service
ConditionPathExists=|/var/lib/YaST2/runme_at_boot ConditionPathExists=/var/lib/YaST2/runme_at_boot
ConditionPathExists=|/run/systemd/keep_running
[Service] [Service]
Type=oneshot Type=oneshot
ExecStart=/bin/touch /run/systemd/keep_running
ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage
RemainAfterExit=yes RemainAfterExit=yes
TimeoutSec=0 TimeoutSec=0
ExecStartPost=/bin/rm -f /var/lib/YaST2/runme_at_boot ExecStartPost=/bin/rm -f /var/lib/YaST2/runme_at_boot
ExecStartPost=/bin/rm -f /run/systemd/keep_running
[Install] [Install]
WantedBy=default.target WantedBy=default.target

3
yast2-installation-2.21.21.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:94f7ab24b9b8eb198af2375b2f5c0aa427f12762c9c715befe96ea40004a6337
size 301490

3
yast2-installation-2.21.23.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:04b88bc90944d75eb3b9af5f07c0a28f98f8055e08714eada7edc316acf7c72b
size 284390

18
yast2-installation.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Tue Oct 11 08:52:43 CEST 2011 - jsuchome@suse.cz
- compress the log file from 1st stage of installation (bnc#716938)
- 2.21.23
-------------------------------------------------------------------
Fri Oct 7 11:38:39 UTC 2011 - fcrozat@suse.com
- Use latest macros for systemd
- Drop workaround for bnc#719221, systemd is fixed now.
- 2.21.22
-------------------------------------------------------------------
Fri Oct 7 11:30:21 UTC 2011 - jsrain@suse.cz
- change the URL for congratulation dialog (bnc#720481)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 10:41:38 CEST 2011 - jsuchome@suse.cz Mon Sep 26 10:41:38 CEST 2011 - jsuchome@suse.cz

122
yast2-installation.spec
View File

@ -19,72 +19,71 @@
Name: yast2-installation Name: yast2-installation
Version: 2.21.21 Version: 2.21.23
Release: 1 Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-installation-%{version}.tar.bz2 Source0: yast2-installation-%{version}.tar.bz2
Prefix: /usr
Group: System/YaST Group: System/YaST
License: GPL v2 or later License: GPL-2.0+
Source1: YaST2-Second-Stage.service Source1: YaST2-Second-Stage.service
Source2: YaST2-Firstboot.service Source2: YaST2-Firstboot.service
%if 0%{?suse_version} >= 1210 %if 0%{?suse_version} >= 1210
BuildRequires: systemd-devel BuildRequires: systemd-devel
%{systemd_requires} %{systemd_requires}
%endif %endif
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite
# FileSystems::possible_root_fs # FileSystems::possible_root_fs
BuildRequires: yast2-storage >= 2.19.12 BuildRequires: yast2-storage >= 2.19.12
# xmllint # xmllint
BuildRequires: libxml2 BuildRequires: libxml2
# to convert control.rnc o control.rng # to convert control.rnc o control.rng
BuildRequires: trang BuildRequires: trang
# PackageCallbacks::RegisterEmptyProgressCallbacks() # PackageCallbacks::RegisterEmptyProgressCallbacks()
BuildRequires: yast2 >= 2.16.52 BuildRequires: yast2 >= 2.16.52
# Pkg::Add/RemoveUpgradeRepo() # Pkg::Add/RemoveUpgradeRepo()
BuildRequires: yast2-pkg-bindings >= 2.21.2 BuildRequires: yast2-pkg-bindings >= 2.21.2
# Unified progress bar (done by visnov) # Unified progress bar (done by visnov)
BuildRequires: yast2-packager >= 2.17.9 BuildRequires: yast2-packager >= 2.17.9
# AutoinstConfig::getProposalList # AutoinstConfig::getProposalList
Requires: autoyast2-installation >= 2.17.1 Requires: autoyast2-installation >= 2.17.1
# ProductControl::DisabledACItems, ::DisabledSubProposals # ProductControl::DisabledACItems, ::DisabledSubProposals
Requires: yast2 >= 2.18.23 Requires: yast2 >= 2.18.23
# Language::GetLanguageItems and other API # Language::GetLanguageItems and other API
# Language::Set (handles downloading the translation extensions) # Language::Set (handles downloading the translation extensions)
Requires: yast2-country-data >= 2.16.11 Requires: yast2-country-data >= 2.16.11
# Pkg::SourceProvideDigestedFile() # Pkg::SourceProvideDigestedFile()
Conflicts: yast2-pkg-bindings < 2.17.25 Conflicts: yast2-pkg-bindings < 2.17.25
# Pkg::Add/RemoveUpgradeRepo() # Pkg::Add/RemoveUpgradeRepo()
Requires: yast2-pkg-bindings >= 2.21.2 Requires: yast2-pkg-bindings >= 2.21.2
# Mouse-related scripts moved to yast2-mouse # Mouse-related scripts moved to yast2-mouse
Conflicts: yast2-mouse < 2.18.0 Conflicts: yast2-mouse < 2.18.0
# New API for ProductLicense # New API for ProductLicense
Requires: yast2-packager >= 2.19.2 Requires: yast2-packager >= 2.19.2
# FileSystems::possible_root_fs # FileSystems::possible_root_fs
Requires: yast2-storage >= 2.19.12 Requires: yast2-storage >= 2.19.12
# use in startup scripts # use in startup scripts
Requires: initviocons Requires: initviocons
# Only in inst-sys # Only in inst-sys
# Requires: yast2-network # Requires: yast2-network
@ -93,20 +92,20 @@ Requires: initviocons
# Pkg::SourceProvideSignedFile Pkg::SourceProvideDigestedFile # Pkg::SourceProvideSignedFile Pkg::SourceProvideDigestedFile
# pkg-bindings are not directly required # pkg-bindings are not directly required
Conflicts: yast2-pkg-bindings < 2.17.25 Conflicts: yast2-pkg-bindings < 2.17.25
# InstError # InstError
Conflicts: yast2 < 2.18.6 Conflicts: yast2 < 2.18.6
# Added new function WFM::ClientExists # Added new function WFM::ClientExists
Conflicts: yast2-core < 2.17.10 Conflicts: yast2-core < 2.17.10
# ButtonBox widget # ButtonBox widget
Conflicts: yast2-ycp-ui-bindings < 2.17.3 Conflicts: yast2-ycp-ui-bindings < 2.17.3
# tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103) # tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103)
Requires: tar gzip Requires: tar gzip
Requires: coreutils Requires: coreutils
# for the first/second stage of installation # for the first/second stage of installation
# currently not used # currently not used
@ -115,31 +114,30 @@ Requires: coreutils
#Requires: /usr/bin/pnmtopng #Requires: /usr/bin/pnmtopng
# BNC 446533, /sbin/lspci called but not installed # BNC 446533, /sbin/lspci called but not installed
Requires: pciutils Requires: pciutils
Recommends: yast2-registration Recommends: yast2-registration
Recommends: yast2-online-update Recommends: yast2-online-update
Recommends: yast2-users Recommends: yast2-users
Recommends: yast2-firewall Recommends: yast2-firewall
Recommends: release-notes Recommends: release-notes
Recommends: curl Recommends: curl
Recommends: yast2-update Recommends: yast2-update
Recommends: yast2-add-on Recommends: yast2-add-on
PreReq: %fillup_prereq PreReq: %fillup_prereq
BuildArch: noarch BuildArchitectures: noarch
Summary: YaST2 - Installation Parts Summary: YaST2 - Installation Parts
%package devel-doc %package devel-doc
Group: Documentation/HTML Group: Documentation/HTML
Requires: yast2-installation >= 2.15.34 Requires: yast2-installation >= 2.15.34
PreReq: %fillup_prereq PreReq: %fillup_prereq
Summary: YaST2 - Installation Parts Summary: YaST2 - Installation Parts
%description %description
System installation code as present on installation media. System installation code as present on installation media.
@ -151,23 +149,23 @@ System installation code as present on installation media.
%setup -n yast2-installation-%{version} %setup -n yast2-installation-%{version}
%build %build
%{prefix}/bin/y2tool y2autoconf %{_prefix}/bin/y2tool y2autoconf
%{prefix}/bin/y2tool y2automake %{_prefix}/bin/y2tool y2automake
autoreconf --force --install autoreconf --force --install
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}} %{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} ./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir}
# V=1: verbose build in case we used AM_SILENT_RULES(yes) # V=1: verbose build in case we used AM_SILENT_RULES(yes)
# so that RPM_OPT_FLAGS check works # so that RPM_OPT_FLAGS check works
make %{?jobs:-j%jobs} V=1 make %{?jobs:-j%jobs} V=1
%install %install
make install DESTDIR="$RPM_BUILD_ROOT" make install DESTDIR="$RPM_BUILD_ROOT"
[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" [ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do
d=${f##*/} d=${f##*/}
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done done
@ -188,15 +186,12 @@ rm -rf "$RPM_BUILD_ROOT"
%if 0%{suse_version} > 1140 %if 0%{suse_version} > 1140
%service_add YaST2-Second-Stage.service YaST2-Firstboot.service %service_add_post YaST2-Second-Stage.service YaST2-Firstboot.service
/bin/systemctl enable YaST2-Second-Stage.service > /dev/null 2>&1 || : %pre
/bin/systemctl enable YaST2-Firstboot.service > /dev/null 2>&1 || : %service_add_pre YaST2-Second-Stage.service YaST2-Firstboot.service
%preun %preun
if [ $1 -eq 0 ]; then
/bin/systemctl disable YaST2-Second-Stage.service YaST2-Firstboot.service > /dev/null 2>&1 || :
fi
%service_del_preun YaST2-Second-Stage.service YaST2-Firstboot.service %service_del_preun YaST2-Second-Stage.service YaST2-Firstboot.service
%postun %postun
@ -219,7 +214,7 @@ fi
/usr/share/YaST2/clients/*.ycp /usr/share/YaST2/clients/*.ycp
/usr/share/YaST2/modules/*.ycp /usr/share/YaST2/modules/*.ycp
/usr/share/YaST2/modules/*.ybc /usr/share/YaST2/modules/*.ybc
%{prefix}/share/applications/YaST2/*.desktop %{_prefix}/share/applications/YaST2/*.desktop
/usr/share/autoinstall/modules/*.desktop /usr/share/autoinstall/modules/*.desktop
/usr/share/YaST2/schema/autoyast/rnc/deploy_image.rnc /usr/share/YaST2/schema/autoyast/rnc/deploy_image.rnc
%dir /usr/share/autoinstall %dir /usr/share/autoinstall
@ -241,18 +236,17 @@ fi
/var/adm/fillup-templates/sysconfig.security-checksig /var/adm/fillup-templates/sysconfig.security-checksig
# programs and scripts # programs and scripts
%{prefix}/lib/YaST2/startup %{_prefix}/lib/YaST2/startup
# icewm # icewm
/etc/icewm /etc/icewm
%dir %{prefix}/share/doc/packages/yast2-installation %dir %{_prefix}/share/doc/packages/yast2-installation
%{prefix}/share/doc/packages/yast2-installation/COPYING %{_prefix}/share/doc/packages/yast2-installation/COPYING
%readme %{prefix}/share/doc/packages/yast2-installation/README %readme %{_prefix}/share/doc/packages/yast2-installation/README
%files devel-doc %files devel-doc
%defattr(-,root,root) %defattr(-,root,root)
%doc %{prefix}/share/doc/packages/yast2-installation %doc %{_prefix}/share/doc/packages/yast2-installation
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING %exclude %{_prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README %exclude %{_prefix}/share/doc/packages/yast2-installation/README
%changelog