From fb1988575d9c7be58ae3015bb77bcf408e5fa4e2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 17 Jan 2006 23:56:28 +0000 Subject: [PATCH] - define unknown macros and display errors when parsing spec Changed files: builder.sh -> 1.388 --- builder.sh | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/builder.sh b/builder.sh index 254b667..eac9678 100644 --- a/builder.sh +++ b/builder.sh @@ -338,10 +338,17 @@ rpm_dump_cache=` # executed here, while none of them are actually needed # what we need from dump is NAME, VERSION, RELEASE and PATCHES/SOURCES. # macros.build + macros contained at the time of this writing 70 %() macros - local macrofiles='/usr/lib/rpm/macros:~/etc/.rpmmacros:~/.rpmmacros' + local macrofiles="/usr/lib/rpm/macros:$SPECS_DIR/.rpmmacros:~/etc/.rpmmacros:~/.rpmmacros" local dump='%{echo:dummy: PACKAGE_NAME %{name} }%dump' # FIXME: better ideas than .rpmrc? printf 'include:/usr/lib/rpm/rpmrc\nmacrofiles:%s\n' $macrofiles > .rpmrc +# TODO: move these to /usr/lib/rpm/macros + cat > .rpmmacros <<'EOF' +%requires_releq_kernel_up %{nil} +%requires_releq_kernel_smp %{nil} +%releq_kernel_up ERROR +%releq_kernel_smp ERROR +EOF case "$RPMBUILD" in rpm ) rpm --rcfile .rpmrc -bp --nodeps --define "prep $dump" $BCOND $TARGET_SWITCH $SPECFILE 2>&1 @@ -350,10 +357,10 @@ rpm_dump_cache=` rpmbuild --rcfile .rpmrc --nodigest --nodeps --nosignature --nobuild --define "prep $dump" $BCOND $TARGET_SWITCH $SPECFILE 2>&1 ;; esac` -# if [ $? -gt 0 ]; then -# echo "$rpm_dump_cache" | sed -ne '/^error:/,$p' >&2 -# Exit_error err_build_fail; -# fi + if [ $? -gt 0 ]; then + echo "$rpm_dump_cache" | sed -ne '/^error:/,$p' >&2 + Exit_error err_build_fail; + fi update_shell_title "cache_rpm_dump: OK!" } -- 2.44.0