pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: PR/36985 pbulk doesn't like .tbz (bzip2) extension for binary pkgsrc packages
Combined patch for this PR and PR/37539
Both they are trivial IMHO
? cksum_summary.patch
? summary_cksum.patch
? tbz_patch.patch
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pbulk/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile 15 Dec 2007 11:06:12 -0000 1.23
+++ Makefile 27 Dec 2007 21:41:38 -0000
@@ -29,9 +29,9 @@
scripts/report scripts/scan scripts/scan-client-start scripts/upload \
scripts/compute-packages.awk scripts/create-broken-graph.awk \
scripts/create-report-html.awk scripts/create-report-txt.awk \
- scripts/create-report.awk
+ scripts/create-report.awk scripts/summary scripts/cksum
SUBST_VARS.tools= AWK BZIP2 DIGEST GZIP_CMD IDENT MAKE MAIL_CMD \
- PBULK_CONFIG PKG_INFO PREFIX SH TAR
+ PBULK_CONFIG PKG_INFO PREFIX SH TAR PKG_SUFX
CONF_FILES+= share/examples/pbulk/pbulk.conf ${PKG_SYSCONFDIR}/pbulk.conf
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pbulk/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- PLIST 19 Jun 2007 19:49:55 -0000 1.1.1.1
+++ PLIST 27 Dec 2007 21:41:38 -0000
@@ -5,6 +5,7 @@
bin/pbulk-scan
libexec/pbulk/build
libexec/pbulk/build-client-start
+libexec/pbulk/cksum
libexec/pbulk/client-clean
libexec/pbulk/compute-packages
libexec/pbulk/create-broken-graph
@@ -17,6 +18,7 @@
libexec/pbulk/report
libexec/pbulk/scan
libexec/pbulk/scan-client-start
+libexec/pbulk/summary
libexec/pbulk/upload
man/cat1/pbulk-build.0
man/cat1/pbulk-resolve.0
Index: files/pbulk/pbulk.conf
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pbulk/files/pbulk/pbulk.conf,v
retrieving revision 1.9
diff -u -r1.9 pbulk.conf
--- files/pbulk/pbulk.conf 17 Oct 2007 20:42:30 -0000 1.9
+++ files/pbulk/pbulk.conf 27 Dec 2007 21:41:38 -0000
@@ -72,6 +72,8 @@
rsync=@PREFIX@/bin/rsync
tar=@TAR@
+pkg_suffix=@PKG_SUFX@
+
loc=${bulklog}/meta
pbuild=@PREFIX@/bin/pbulk-build
@@ -98,6 +100,8 @@
script_phase_pre_build=@PREFIX@/libexec/pbulk/pre-build
script_phase_build=@PREFIX@/libexec/pbulk/build
+script_phase_summary=@PREFIX@/libexec/pbulk/summary
+script_phase_cksum=@PREFIX@/libexec/pbulk/cksum
script_phase_report=@PREFIX@/libexec/pbulk/report
script_phase_scan=@PREFIX@/libexec/pbulk/scan
script_phase_upload=@PREFIX@/libexec/pbulk/upload
Index: files/pbulk/scripts/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pbulk/files/pbulk/scripts/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- files/pbulk/scripts/Makefile 19 Jun 2007 19:49:59 -0000 1.1.1.1
+++ files/pbulk/scripts/Makefile 27 Dec 2007 21:41:38 -0000
@@ -2,7 +2,7 @@
SCRIPTS= build build-client-start bulkbuild client-clean \
pkg-build pkg-up-to-date pre-build report scan \
- scan-client-start upload \
+ scan-client-start cksum summary upload \
compute-packages.awk create-broken-graph.awk \
create-report-html.awk create-report-txt.awk \
create-report.awk
Index: files/pbulk/scripts/build
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pbulk/files/pbulk/scripts/build,v
retrieving revision 1.2
diff -u -r1.2 build
--- files/pbulk/scripts/build 20 Jul 2007 19:39:34 -0000 1.2
+++ files/pbulk/scripts/build 27 Dec 2007 21:41:38 -0000
@@ -49,16 +49,3 @@
esac
date '+BUILD_END_ISO=%Y-%m-%d %H:%M' >> ${loc}/status
-
-echo "Building pkg_summary..."
-cd ${packages}/All
-sed 's/$/.tgz/' < ${loc}/success | sort | xargs ${external_pkg_info} -X |
${gzip} -c > pkg_summary.gz
-${gzip} -dc < pkg_summary.gz | ${bzip2} -c > pkg_summary.bz2
-
-echo "Building SHA512..."
-cd ${packages}
-{
- echo "All/pkg_summary.bz2"
- echo "All/pkg_summary.gz"
- sed 's|^\(.*\)$|All/\1.tgz|' < ${loc}/success
-} | sort | xargs ${digest} SHA512 | ${bzip2} -c > SHA512.bz2
Index: files/pbulk/scripts/bulkbuild
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pbulk/files/pbulk/scripts/bulkbuild,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 bulkbuild
--- files/pbulk/scripts/bulkbuild 19 Jun 2007 19:49:59 -0000 1.1.1.1
+++ files/pbulk/scripts/bulkbuild 27 Dec 2007 21:41:38 -0000
@@ -8,5 +8,7 @@
${script_phase_pre_build}
${script_phase_scan}
${script_phase_build}
+${script_phase_summary}
+${script_phase_cksum}
${script_phase_report}
${script_phase_upload}
Index: files/pbulk/scripts/cksum
===================================================================
RCS file: files/pbulk/scripts/cksum
diff -N files/pbulk/scripts/cksum
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/pbulk/scripts/cksum 27 Dec 2007 21:41:38 -0000
@@ -0,0 +1,13 @@
+#!@SH@
+
+. @PBULK_CONFIG@
+
+set -e
+
+echo "Building SHA512..."
+cd ${packages}
+{
+ echo "All/pkg_summary.bz2"
+ echo "All/pkg_summary.gz"
+ sed 's|^\(.*\)$|All/\1'"${pkg_suffix}|" < ${loc}/success
+} | sort | xargs ${digest} SHA512 | ${bzip2} -c > SHA512.bz2
Index: files/pbulk/scripts/compute-packages.awk
===================================================================
RCS file:
/cvsroot/pkgsrc/pkgtools/pbulk/files/pbulk/scripts/compute-packages.awk,v
retrieving revision 1.2
diff -u -r1.2 compute-packages.awk
--- files/pbulk/scripts/compute-packages.awk 29 Jun 2007 22:43:26 -0000
1.2
+++ files/pbulk/scripts/compute-packages.awk 27 Dec 2007 21:41:38 -0000
@@ -67,7 +67,7 @@
print "+ " cat "/"
printed_cats[cat] = cat
}
- print "+ " cat "/" pkg ".tgz"
+ print "+ " cat "/" pkg ENVIRON ["pkg_suffix"]
}
}
}
Index: files/pbulk/scripts/pkg-up-to-date
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 pkg-up-to-date
--- files/pbulk/scripts/pkg-up-to-date 19 Jun 2007 19:49:59 -0000 1.1.1.1
+++ files/pbulk/scripts/pkg-up-to-date 27 Dec 2007 21:41:38 -0000
@@ -34,7 +34,7 @@
set -e
-pkg="${packages}/All/$1.tgz"
+pkg="${packages}/All/$1${pkg_suffix}"
[ -f ${pkg} ]
${external_pkg_info} -qb ${pkg} | sed 's/:/ /' | while read file file_id; do
@@ -60,5 +60,5 @@
fi
done
[ $found = 1 ]
- [ "${packages}/All/${dep}.tgz" -nt "${pkg}" ] && exit 1
+ [ "${packages}/All/${dep}${pkg_suffix}" -nt "${pkg}" ] && exit 1
done
Index: files/pbulk/scripts/summary
===================================================================
RCS file: files/pbulk/scripts/summary
diff -N files/pbulk/scripts/summary
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/pbulk/scripts/summary 27 Dec 2007 21:41:38 -0000
@@ -0,0 +1,10 @@
+#!@SH@
+
+. @PBULK_CONFIG@
+
+set -e
+
+echo "Building pkg_summary..."
+cd ${packages}/All
+sed 's/$/'"${pkg_suffix}/" < ${loc}/success | sort | xargs
${external_pkg_info} -X | ${gzip} -c > pkg_summary.gz
+${gzip} -dc < pkg_summary.gz | ${bzip2} -c > pkg_summary.bz2
Index: files/pbulk/scripts/upload
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pbulk/files/pbulk/scripts/upload,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 upload
--- files/pbulk/scripts/upload 19 Jun 2007 19:49:59 -0000 1.1.1.1
+++ files/pbulk/scripts/upload 27 Dec 2007 21:41:38 -0000
@@ -40,6 +40,7 @@
echo "+ SHA512.bz2"
echo "+ All/pkg_summary.bz2"
echo "+ All/pkg_summary.gz"
+ export pkg_suffix
${packages_script} ${loc}
echo "- *"
} | sort | ${rsync} --exclude-from=- ${pkg_rsync_args} . ${pkg_rsync_target}
--
Best regards, Aleksey Cheusov.
Home |
Main Index |
Thread Index |
Old Index