[Rpm-maint] [PATCH] Add option to have unique debug source dirs across version/release/arch.

Mark Wielaard mjw at redhat.com
Wed Mar 1 13:53:16 UTC 2017


On Tue, 2017-02-28 at 21:34 +0100, Mark Wielaard wrote:
> @@ -305,7 +317,18 @@ do_file()
>    if [ ! -z "$ver_rel" ]; then
>      build_id_seed="--build-id-seed=$ver_rel"
>    fi
> -  id=$(${lib_rpm_dir}/debugedit -b "$RPM_BUILD_DIR" -d /usr/src/debug \
> +  # See also cpio SOURCEFILE copy. Directories must match up.
> +  debug_base_name="$RPM_BUILD_DIR"
> +  debug_dest_name="/usr/src/debug"
> +  if [ ! -z "$unique_debug_src_base" ]; then
> +    debug_base_name="$BUILDDIR"
> +    debug_dest_name="/usr/src/debug/${unique_debug_src_base}-${ver_rel}.${unique_debug_arch}"
> +  fi
> +echo "RPM_BUILD_DIR: $RPM_BUILD_DIR"
> +echo "BUILDDIR: $BUILDDIR"
> +  echo ${lib_rpm_dir}/debugedit -b $debug_base_name -d $debug_dest_name \
> +			      -i $build_id_seed -l "$SOURCEFILE" "$f"
> +  id=$(${lib_rpm_dir}/debugedit -b $debug_base_name -d $debug_dest_name \
>  			      -i $build_id_seed -l "$SOURCEFILE" "$f") || exit
>    if [ -z "$id" ]; then
>      echo >&2 "*** ${strict_error}: No build ID note found in $f"

Sorry, those three extra echo lines before the actual debugedit
invocation obviously shouldn't have been there. They were just for
debugging and I forgot to remove them in the final patch.




More information about the Rpm-maint mailing list