Rename spec and package(s) to match repository name

Change-Id: Id011a220bba07c9042fd59bd0bb61f009e6d0ea7

diff --git a/packaging/upgrade-engine.spec b/packaging/upgrade-engine.spec
deleted file mode 100644 (file)
index 2970792..0000000
--- a/packaging/upgrade-engine.spec
+++ /dev/null
@@ -1,154 +0,0 @@
-%define upgrade_support_dir %{_libexecdir}/upgrade-support
-%define upgrade_scripts_dir %TZ_SYS_UPGRADE
-
-Name:          upgrade-engine
-Summary:       Upgrade engine for Tizen
-Version:       7.5.1
-Release:       0
-Group:         System
-License:       Apache-2.0
-Source0:       %{name}-%{version}.tar.gz
-
-BuildRequires: cmake
-BuildRequires:  ca-certificates-devel
-BuildRequires:  pkgconfig(liblzma-tool)
-BuildRequires:  libbrotli-devel
-BuildRequires:  pkgconfig(openssl1.1)
-BuildRequires:  pkgconfig(libtzplatform-config)
-BuildRequires:  pkgconfig(dlog)
-Buildrequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(hal-api-device)
-BuildRequires:  libtar-devel
-
-Requires:       tar
-Requires:       gzip
-
-# from factory-reset:
-Requires:       %{_bindir}/rstsmack
-
-%description
-Update engine for updating Tizen platform images using delta files
-generated by upgrade-tools.
-
-%prep
-%setup -q
-
-%build
-export LDFLAGS+="-Wl,--rpath=%{_libdir} -Wl,--as-needed"
-LDFLAGS="$LDFLAGS"
-
-%define system_bus_services_dir /usr/share/dbus-1/system-services
-%define systemd_dbus_conf_dir /etc/dbus-1/system.d
-
-# You must set CA directory in the RO section to prevent manipulation
-%define img_verifier_root_ca_dir %{TZ_SYS_RO_CA_DIR}/img-verifier
-%define upgrade_initrd_list_dir %{_datadir}/initrd-recovery/initrd.list.d
-
-%cmake \
-       -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-       -DIMG_VERIFIER_ROOT_CA_DIR=%{img_verifier_root_ca_dir} \
-       -DUPGRADE_INITRD_LIST_DIR=%{upgrade_initrd_list_dir} \
-       -DUPGRADE_SCRIPTS_DIR=%{upgrade_scripts_dir} \
-       -DUPGRADE_VAR_DIR=%TZ_SYS_VAR \
-       -DUPGRADE_PKGSCRIPTS_DIR=%TZ_SYS_UPGRADE_SCRIPTS \
-       -DUNIT_DIR=%{_unitdir} \
-       .
-
-make %{?jobs:-j%jobs}
-
-%install
-%make_install
-
-mkdir -p %{buildroot}%{upgrade_support_dir}
-install -m 755 scripts/upgrade-support/* %{buildroot}%{upgrade_support_dir}
-
-%define fota_dir /opt/usr/data/fota
-mkdir -p %{buildroot}%{fota_dir}
-mkdir -p %{buildroot}%{img_verifier_root_ca_dir}
-mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
-
-install -m 644 scripts/clone_partitions/clone_partitions.service %{buildroot}%{_unitdir}
-ln -s ../clone_partitions.service %{buildroot}%{_unitdir}/multi-user.target.wants/
-install -m 775 scripts/clone_partitions/clone_partitions.sh %{buildroot}%{_bindir}
-
-mkdir -p %{buildroot}%{_unitdir}/recovery.service.wants
-install -m 644 scripts/clone_partitions/clone_partitions_recovery.service %{buildroot}%{_unitdir}
-ln -s ../clone_partitions_recovery.service %{buildroot}%{_unitdir}/recovery.service.wants/
-
-# rw-update
-mkdir -p %{buildroot}%{_unitdir}/system-update.target.wants
-mkdir -p %{buildroot}%{_unitdir}/data-checkpoint.target.wants
-mkdir -p %{buildroot}%{_unitdir}/delayed.target.wants
-ln -s ../getty.target %{buildroot}%{_unitdir}/system-update.target.wants
-ln -s ../cynara.socket %{buildroot}%{_unitdir}/system-update.target.wants
-ln -s ../dbus.socket %{buildroot}%{_unitdir}/system-update.target.wants
-ln -s ../udev-sdb-init.service %{buildroot}%{_unitdir}/system-update.target.wants
-ln -s ../offline-update.service %{buildroot}%{_unitdir}/system-update.target.wants
-ln -s ../udev-trigger-dmbow@.service %{buildroot}%{_unitdir}/system-update.target.wants/udev-trigger-dmbow@user.service
-ln -s ../data-checkpoint.target %{buildroot}%{_unitdir}/system-update.target.wants
-ln -s ../data-checkpoint.service %{buildroot}%{_unitdir}/data-checkpoint.target.wants/data-checkpoint.service
-ln -s ../update-post.service %{buildroot}%{_unitdir}/system-update.target.wants
-ln -s ../update-finalize.service %{buildroot}%{_unitdir}/delayed.target.wants
-
-%posttrans
-newrulesfile=99-sdb-switch.rules
-newrulespath=%{upgrade_scripts_dir}/$newrulesfile
-rulesdir=/usr/lib/udev/rules.d
-if [ -e "$rulesdir/$newrulesfile" ]; then
-    echo "$newrulesfile exists. Skip creating symlink"
-else
-    mkdir -p "$rulesdir"
-    ln -sf "$newrulespath" "$rulesdir"
-fi
-
-%files
-%license LICENSE
-%manifest upgrade.manifest
-%doc README
-%attr(775, root, system_fw) %{fota_dir}
-%attr(700,-,-) %{upgrade_initrd_list_dir}/40-upgrade.list
-%defattr(-,root,root,-)
-%{_bindir}/clone_partitions.sh
-%attr(644, root, root) %{_unitdir}/clone_partitions.service
-%{_unitdir}/multi-user.target.wants/clone_partitions.service
-%attr(644, root, root) %{_unitdir}/clone_partitions_recovery.service
-%{_unitdir}/recovery.service.wants/clone_partitions_recovery.service
-%{upgrade_support_dir}/upgrade-trigger.sh
-%{upgrade_support_dir}/upgrade-partial.sh
-%{upgrade_support_dir}/upgrade-prepare-partitions.sh
-%{upgrade_support_dir}/upgrade-fota.sh
-%{upgrade_support_dir}/upgrade-legacy.sh
-%{upgrade_support_dir}/upgrade-common.inc
-%{_bindir}/upgrade-apply
-%{_bindir}/verity_handler
-%{_bindir}/blkid-print
-# Image verifier
-%{_sbindir}/img-verifier
-%attr(755,root,root) %{img_verifier_root_ca_dir}
-# rw-upgrade
-%{_unitdir}/data-checkpoint.service
-%{_unitdir}/data-checkpoint.target
-%{_unitdir}/data-checkpoint.target.wants/data-checkpoint.service
-%{_unitdir}/delayed.target.wants/update-finalize.service
-%{_unitdir}/offline-update.service
-%{_unitdir}/system-update.target.wants/cynara.socket
-%{_unitdir}/system-update.target.wants/data-checkpoint.target
-%{_unitdir}/system-update.target.wants/dbus.socket
-%{_unitdir}/system-update.target.wants/getty.target
-%{_unitdir}/system-update.target.wants/offline-update.service
-%{_unitdir}/system-update.target.wants/udev-sdb-init.service
-%{_unitdir}/system-update.target.wants/udev-trigger-dmbow@user.service
-%{_unitdir}/system-update.target.wants/update-post.service
-%{_unitdir}/udev-sdb-init.service
-%{_unitdir}/udev-trigger-dmbow@.service
-%{_unitdir}/update-finalize.service
-%{_unitdir}/update-post.service
-%{upgrade_scripts_dir}/99-sdb-switch.rules
-%{upgrade_scripts_dir}/install-sdb-rule.sh
-%{upgrade_scripts_dir}/record-version.sh
-%{upgrade_scripts_dir}/rw-update-macro.inc
-%{upgrade_scripts_dir}/update-checkpoint-create.sh
-%{upgrade_scripts_dir}/update-finalize.sh
-%{upgrade_scripts_dir}/update-init.sh
-%{upgrade_scripts_dir}/update-post.sh
-%{upgrade_scripts_dir}/update.sh

diff --git a/packaging/upgrade.spec b/packaging/upgrade.spec
new file mode 100644 (file)
index 0000000..2c87283
--- /dev/null
+++ b/packaging/upgrade.spec
@@ -0,0 +1,171 @@
+%define upgrade_support_dir %{_libexecdir}/upgrade-support
+%define upgrade_scripts_dir %TZ_SYS_UPGRADE
+
+Name:          upgrade
+Summary:       Upgrade support for Tizen
+Version:       7.5.2
+Release:       0
+Group:         System
+License:       Apache-2.0
+Source0:       %{name}-%{version}.tar.gz
+
+BuildRequires: cmake
+BuildRequires:  ca-certificates-devel
+BuildRequires:  pkgconfig(liblzma-tool)
+BuildRequires:  libbrotli-devel
+BuildRequires:  pkgconfig(openssl1.1)
+BuildRequires:  pkgconfig(libtzplatform-config)
+BuildRequires:  pkgconfig(dlog)
+Buildrequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(hal-api-device)
+BuildRequires:  libtar-devel
+
+Requires:       upgrade-engine = %{version}-%{release}
+
+%description
+Metapackage requiring all upgrade-related packages on the platform.
+
+%package        engine
+Summary:        Utilities and configuration for handling Tizen platform upgrade
+Group:          System
+Requires:       tar
+Requires:       gzip
+# from factory-reset:
+Requires:       %{_bindir}/rstsmack
+
+%description    engine
+Update engine adding all necessary tools, scripts and configuration
+for updating Tizen platform images using delta files as generated by
+upgrade-tools.
+
+
+%description
+Update engine for updating Tizen platform images using delta files
+generated by upgrade-tools.
+
+%prep
+%setup -q
+
+%build
+export LDFLAGS+="-Wl,--rpath=%{_libdir} -Wl,--as-needed"
+LDFLAGS="$LDFLAGS"
+
+%define system_bus_services_dir /usr/share/dbus-1/system-services
+%define systemd_dbus_conf_dir /etc/dbus-1/system.d
+
+# You must set CA directory in the RO section to prevent manipulation
+%define img_verifier_root_ca_dir %{TZ_SYS_RO_CA_DIR}/img-verifier
+%define upgrade_initrd_list_dir %{_datadir}/initrd-recovery/initrd.list.d
+
+%cmake \
+       -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+       -DIMG_VERIFIER_ROOT_CA_DIR=%{img_verifier_root_ca_dir} \
+       -DUPGRADE_INITRD_LIST_DIR=%{upgrade_initrd_list_dir} \
+       -DUPGRADE_SCRIPTS_DIR=%{upgrade_scripts_dir} \
+       -DUPGRADE_VAR_DIR=%TZ_SYS_VAR \
+       -DUPGRADE_PKGSCRIPTS_DIR=%TZ_SYS_UPGRADE_SCRIPTS \
+       -DUNIT_DIR=%{_unitdir} \
+       .
+
+make %{?jobs:-j%jobs}
+
+%install
+%make_install
+
+mkdir -p %{buildroot}%{upgrade_support_dir}
+install -m 755 scripts/upgrade-support/* %{buildroot}%{upgrade_support_dir}
+
+%define fota_dir /opt/usr/data/fota
+mkdir -p %{buildroot}%{fota_dir}
+mkdir -p %{buildroot}%{img_verifier_root_ca_dir}
+mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
+
+install -m 644 scripts/clone_partitions/clone_partitions.service %{buildroot}%{_unitdir}
+ln -s ../clone_partitions.service %{buildroot}%{_unitdir}/multi-user.target.wants/
+install -m 775 scripts/clone_partitions/clone_partitions.sh %{buildroot}%{_bindir}
+
+mkdir -p %{buildroot}%{_unitdir}/recovery.service.wants
+install -m 644 scripts/clone_partitions/clone_partitions_recovery.service %{buildroot}%{_unitdir}
+ln -s ../clone_partitions_recovery.service %{buildroot}%{_unitdir}/recovery.service.wants/
+
+# rw-update
+mkdir -p %{buildroot}%{_unitdir}/system-update.target.wants
+mkdir -p %{buildroot}%{_unitdir}/data-checkpoint.target.wants
+mkdir -p %{buildroot}%{_unitdir}/delayed.target.wants
+ln -s ../getty.target %{buildroot}%{_unitdir}/system-update.target.wants
+ln -s ../cynara.socket %{buildroot}%{_unitdir}/system-update.target.wants
+ln -s ../dbus.socket %{buildroot}%{_unitdir}/system-update.target.wants
+ln -s ../udev-sdb-init.service %{buildroot}%{_unitdir}/system-update.target.wants
+ln -s ../offline-update.service %{buildroot}%{_unitdir}/system-update.target.wants
+ln -s ../udev-trigger-dmbow@.service %{buildroot}%{_unitdir}/system-update.target.wants/udev-trigger-dmbow@user.service
+ln -s ../data-checkpoint.target %{buildroot}%{_unitdir}/system-update.target.wants
+ln -s ../data-checkpoint.service %{buildroot}%{_unitdir}/data-checkpoint.target.wants/data-checkpoint.service
+ln -s ../update-post.service %{buildroot}%{_unitdir}/system-update.target.wants
+ln -s ../update-finalize.service %{buildroot}%{_unitdir}/delayed.target.wants
+
+%posttrans engine
+newrulesfile=99-sdb-switch.rules
+newrulespath=%{upgrade_scripts_dir}/$newrulesfile
+rulesdir=/usr/lib/udev/rules.d
+if [ -e "$rulesdir/$newrulesfile" ]; then
+    echo "$newrulesfile exists. Skip creating symlink"
+else
+    mkdir -p "$rulesdir"
+    ln -sf "$newrulespath" "$rulesdir"
+fi
+
+%files
+%license LICENSE
+%manifest upgrade.manifest
+
+%files engine
+%license LICENSE
+%manifest upgrade.manifest
+%doc README
+%attr(775, root, system_fw) %{fota_dir}
+%attr(700,-,-) %{upgrade_initrd_list_dir}/40-upgrade.list
+%defattr(-,root,root,-)
+%{_bindir}/clone_partitions.sh
+%attr(644, root, root) %{_unitdir}/clone_partitions.service
+%{_unitdir}/multi-user.target.wants/clone_partitions.service
+%attr(644, root, root) %{_unitdir}/clone_partitions_recovery.service
+%{_unitdir}/recovery.service.wants/clone_partitions_recovery.service
+%{upgrade_support_dir}/upgrade-trigger.sh
+%{upgrade_support_dir}/upgrade-partial.sh
+%{upgrade_support_dir}/upgrade-prepare-partitions.sh
+%{upgrade_support_dir}/upgrade-fota.sh
+%{upgrade_support_dir}/upgrade-legacy.sh
+%{upgrade_support_dir}/upgrade-common.inc
+%{_bindir}/upgrade-apply
+%{_bindir}/verity_handler
+%{_bindir}/blkid-print
+# Image verifier
+%{_sbindir}/img-verifier
+%attr(755,root,root) %{img_verifier_root_ca_dir}
+# rw-upgrade
+%{_unitdir}/data-checkpoint.service
+%{_unitdir}/data-checkpoint.target
+%{_unitdir}/data-checkpoint.target.wants/data-checkpoint.service
+%{_unitdir}/delayed.target.wants/update-finalize.service
+%{_unitdir}/offline-update.service
+%{_unitdir}/system-update.target.wants/cynara.socket
+%{_unitdir}/system-update.target.wants/data-checkpoint.target
+%{_unitdir}/system-update.target.wants/dbus.socket
+%{_unitdir}/system-update.target.wants/getty.target
+%{_unitdir}/system-update.target.wants/offline-update.service
+%{_unitdir}/system-update.target.wants/udev-sdb-init.service
+%{_unitdir}/system-update.target.wants/udev-trigger-dmbow@user.service
+%{_unitdir}/system-update.target.wants/update-post.service
+%{_unitdir}/udev-sdb-init.service
+%{_unitdir}/udev-trigger-dmbow@.service
+%{_unitdir}/update-finalize.service
+%{_unitdir}/update-post.service
+%{upgrade_scripts_dir}/99-sdb-switch.rules
+%{upgrade_scripts_dir}/install-sdb-rule.sh
+%{upgrade_scripts_dir}/record-version.sh
+%{upgrade_scripts_dir}/rw-update-macro.inc
+%{upgrade_scripts_dir}/update-checkpoint-create.sh
+%{upgrade_scripts_dir}/update-finalize.sh
+%{upgrade_scripts_dir}/update-init.sh
+%{upgrade_scripts_dir}/update-post.sh
+%{upgrade_scripts_dir}/update.sh