Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix the source manifest generation by using a simple shell script to …

…scan the SRPMS, rather than a hideous make/shell fragment.

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
  • Loading branch information...
commit 4ea9b6272f0218eb7578ac326fb60493f8d4c13b 1 parent 1c7e52c
@djs55 djs55 authored
Showing with 17 additions and 4 deletions.
  1. +1 −4 mk/Makefile
  2. +16 −0 mk/srpms-to-manifest
View
5 mk/Makefile
@@ -38,10 +38,7 @@ build: $(OUTPUT_CLI_RT) $(OUTPUT_SDK) $(MY_SOURCES)/MANIFEST
$(MY_SOURCES)/MANIFEST: $(MY_SOURCES_DIRSTAMP) $(OUTPUT_XAPI_SRC)
rm -f $@
- @for srpm in "$(/bin/ls -1 ${MY_OUTPUT_DIR}/SRPMS)"; do \
- path=$(MY_OUTPUT_DIR)/SRPMS/${srpm}; \
- echo "$(${RPM} --qf "%{name}" -qp ${path}) $(${RPM} --qf "%{License}" -qp ${path}) ${path}" >>$@; \
- done
+ /bin/sh ./srpms-to-manifest api $(MY_OUTPUT_DIR)/SRPMS > $@
echo api gpl file $(JQUERY_PACK_DIST) >> $@
echo api gpl file $(JQUERY_TV_DIST) >> $@
View
16 mk/srpms-to-manifest
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# take a component and a directory as arguments, write to stdout a
+# MANIFEST file fragment
+if [ -z "${RPM}" ]; then
+ RPM=/bin/rpm
+fi
+
+component=$1
+dir=$2
+for path in $(/bin/ls -1 $2/*.src.rpm); do
+ name=$(${RPM} --qf "%{name}" -qp ${path})
+ license=$(${RPM} --qf "%{License}" -qp ${path})
+ license=$(echo ${license} | /bin/sed -e 's/\s/_/g')
+ echo "${component} ${license} file ${path}"
+done
Please sign in to comment.
Something went wrong with that request. Please try again.