diff options
| -rw-r--r-- | changelog | 1 | ||||
| -rw-r--r-- | patches/0001-ob-buildopk-touch-after-gzip-not-before.patch | 26 | ||||
| -rw-r--r-- | patches/0002-ob-buildenv-Set-ffile-prefix-map.patch | 27 | ||||
| -rw-r--r-- | patches/0003-ob-gencontrol-Reduce-deps-after-substvars.patch | 37 |
4 files changed, 1 insertions, 90 deletions
@@ -1,6 +1,7 @@ opkbuild (4.2.2-1) trunk * New upstream version. + - Drop patches from upstream. -- Patrick McDermott <patrick.mcdermott@libiquity.com> Sat, 02 Jan 2021 21:10:24 -0500 diff --git a/patches/0001-ob-buildopk-touch-after-gzip-not-before.patch b/patches/0001-ob-buildopk-touch-after-gzip-not-before.patch deleted file mode 100644 index d5c44ff..0000000 --- a/patches/0001-ob-buildopk-touch-after-gzip-not-before.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e39a6e99302e8a780ca9867f92713e3fdfc518fc Mon Sep 17 00:00:00 2001 -From: Patrick McDermott <patrick.mcdermott@libiquity.com> -Date: Wed, 9 Dec 2020 09:40:50 -0500 -Subject: [PATCH] ob-buildopk: touch after gzip, not before - ---- - src/ob-buildopk.sh | 1 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ob-buildopk.sh b/src/ob-buildopk.sh -index 11c4434..dc88758 100644 ---- a/src/ob-buildopk.sh -+++ b/src/ob-buildopk.sh -@@ -87,8 +87,8 @@ build_opk() - ${TAR} -cf '../control.tar' --no-recursion -T -) - (cd -- "${binary}.data" && find '.' | LC_ALL=C sort ${sort_r} | \ - ${TAR} -cf '../data.tar' --no-recursion -T -) -- ${TOUCH} -t "${date}" 'control.tar' 'data.tar' - ${GZIP} 'control.tar' 'data.tar' -+ ${TOUCH} -t "${date}" 'control.tar.gz' 'data.tar.gz' - - ${TAR} -cf "../../${binary_qual}_${version}_${arch}_${plat}.tar" \ - 'debian-binary' 'control.tar.gz' 'data.tar.gz' --- -2.11.0 - diff --git a/patches/0002-ob-buildenv-Set-ffile-prefix-map.patch b/patches/0002-ob-buildenv-Set-ffile-prefix-map.patch deleted file mode 100644 index 0dee900..0000000 --- a/patches/0002-ob-buildenv-Set-ffile-prefix-map.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c18744dc6fcc5a0a82338ab218001d0994c79571 Mon Sep 17 00:00:00 2001 -From: Patrick McDermott <patrick.mcdermott@libiquity.com> -Date: Wed, 9 Dec 2020 10:21:05 -0500 -Subject: [PATCH] ob-buildenv: Set -ffile-prefix-map - ---- - src/ob-buildenv.sh | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/ob-buildenv.sh b/src/ob-buildenv.sh -index 6d42851..0bbfdbb 100644 ---- a/src/ob-buildenv.sh -+++ b/src/ob-buildenv.sh -@@ -84,6 +84,10 @@ setup_build_flags() - if [ -r "${build_flags}" ]; then - . "${build_flags}" - fi -+ printf "CFLAGS='%s %s'\\n" "${CFLAGS:-}" \ -+ "-ffile-prefix-map=${PWD}=." -+ printf "CXXFLAGS='%s %s'\\n" "${CXXFLAGS:-}" \ -+ "-ffile-prefix-map=${PWD}=." - - return 0 - } --- -2.11.0 - diff --git a/patches/0003-ob-gencontrol-Reduce-deps-after-substvars.patch b/patches/0003-ob-gencontrol-Reduce-deps-after-substvars.patch deleted file mode 100644 index 4649a4f..0000000 --- a/patches/0003-ob-gencontrol-Reduce-deps-after-substvars.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 58940e7e9ee1b02c454b6164c60e6333307b6ba3 Mon Sep 17 00:00:00 2001 -From: Patrick McDermott <patrick.mcdermott@libiquity.com> -Date: Wed, 9 Dec 2020 12:44:35 -0500 -Subject: [PATCH] ob-gencontrol: Reduce deps after substvars - ---- - src/ob-gencontrol.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/ob-gencontrol.sh b/src/ob-gencontrol.sh -index 1c0da12..5a103a0 100644 ---- a/src/ob-gencontrol.sh -+++ b/src/ob-gencontrol.sh -@@ -164,18 +164,18 @@ gen_control_bin() - 'Essential') - ;; - 'Depends' | 'Recommends' | 'Suggests' | 'Pre-Depends') -+ value="$(ob_substvars "${value}" "${binary}")" - value="$(ob_reduce_deps \ - -a "${OPK_HOST_ARCH}" \ - -p "${OPK_HOST_PLAT}" \ - -- "${value}")" -- value="$(ob_substvars "${value}" "${binary}")" - ;; - 'Conflicts' | 'Provides' | 'Replaces') -+ value="$(ob_substvars "${value}" "${binary}")" - value="$(ob_reduce_deps \ - -a "${OPK_HOST_ARCH}" \ - -p "${OPK_HOST_PLAT}" \ - -u -- "${value}")" -- value="$(ob_substvars "${value}" "${binary}")" - ;; - esac - printf '%s: %s\n' "${name}" "${value}" | sed 's/[, ]*$//' >&3 --- -2.11.0 - |