diff options
| author | Youngjae Cho <y0.cho@samsung.com> | 2024-07-24 10:58:24 +0900 |
|---|---|---|
| committer | Youngjae Cho <y0.cho@samsung.com> | 2024-07-24 11:29:34 +0900 |
| commit | 3a88e6972bb633f06d9f9c0b78d9725d07c8ae86 (patch) | |
| tree | ca40225d4e81a2528e153b93beb8232fd8dc5482 | |
| parent | ba0f086a908c84b367cdbf8902b584fb6652715c (diff) | |
| download | rpm-accepted/tizen_base_x.tar.gz rpm-accepted/tizen_base_x.tar.bz2 rpm-accepted/tizen_base_x.zip | |
Fix lookup path for specfile from BUILD to SOURCEaccepted/tizen/base/x/20240725.210915accepted/tizen/base/20240725.210859accepted/tizen_base_xaccepted/tizen_base
The hal-rootstrap-checker is better to look around the %{_topdir}/SOURCE
rather than %{_topdir}/BUILD/%{buildsubdir}/packaging for specfile. This
is because there are packages that don't have their specfile at the
%{_topdir}/BUILD/%{buildsubdir}/packaging
Change-Id: Ic208eb611d38a31214935e4d9c15210f8187f0f1
Signed-off-by: Youngjae Cho <y0.cho@samsung.com>
| -rw-r--r-- | packaging/hal-rootstrap-checker.sh | 4 | ||||
| -rw-r--r-- | packaging/rpm-tizen_macros | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packaging/hal-rootstrap-checker.sh b/packaging/hal-rootstrap-checker.sh index cc204998f..4649a3eb1 100644 --- a/packaging/hal-rootstrap-checker.sh +++ b/packaging/hal-rootstrap-checker.sh @@ -56,14 +56,14 @@ print_checker_disabled_warning() { ### main ### disable_hal_rootstrap_checker=$1 -builddir=$2 +sourcedir=$2 buildrequires_whitelist=( "cmake" "pkgconfig(hal-rootstrap)" ) -specfile=$(ls -A1 $builddir/packaging/*.spec) +specfile=$(ls -A1 $sourcedir/*.spec) specfile_buildrequires=() specfile_buildrequires_not_allowed=() specfile_buildrequires_has_hal_rootstrap=0 diff --git a/packaging/rpm-tizen_macros b/packaging/rpm-tizen_macros index e4f7a7d90..e61097622 100644 --- a/packaging/rpm-tizen_macros +++ b/packaging/rpm-tizen_macros @@ -51,7 +51,7 @@ %{nil} %__hal_rootstrap_checker_install_post \ - %{_rpmconfigdir}/tizen/hal-rootstrap-checker.sh %{!?disable_hal_rootstrap_checker:0}%{?disable_hal_rootstrap_checker} %{_builddir}/%{?buildsubdir} \ + %{_rpmconfigdir}/tizen/hal-rootstrap-checker.sh %{!?disable_hal_rootstrap_checker:0}%{?disable_hal_rootstrap_checker} %{_sourcedir} \ %{nil} %__spec_install_post\ |