cygport no longer removes "cygwin" from the dependency list

cygport no longer removes "cygwin" from the dependency list

[Ken Brown]

Now that we've moved from cygwin-1.7.x to cygwin-2.x.y, line 681 of 
pkg_pkg.cygpart no longer filters out "cygwin".  Presumably you just 
want to replace "cygwin-1" by "cygwin-2", unless there's a reason to 
allow for the possibility that maintainers are building without having 
the latest version of cygwin installed.

Ken

Re: cygport no longer removes "cygwin" from the dependency list

[Yaakov Selkowitz]

On Wed, 2015-05-06 at 14:33 -0400, Ken Brown wrote:
> Now that we've moved from cygwin-1.7.x to cygwin-2.x.y, line 681 of 
> pkg_pkg.cygpart no longer filters out "cygwin".  Presumably you just 
> want to replace "cygwin-1" by "cygwin-2", unless there's a reason to 
> allow for the possibility that maintainers are building without having 
> the latest version of cygwin installed.

Good catch.  OTOH, we were only skipping the 'cygwin' dep in setup.hint
because of an issue with deptree ordering of postinstall scripts.  Given
the recent changes to postinstall handling in setup, is there any reason
we can't just stop ignoring the cygwin dep?

--
Yaakov

Re: cygport no longer removes "cygwin" from the dependency list

[Achim Gratz]

[-- Attachment #1: Type: text/plain, Size: 701 bytes --]

Yaakov Selkowitz writes:
> Good catch.  OTOH, we were only skipping the 'cygwin' dep in setup.hint
> because of an issue with deptree ordering of postinstall scripts.  Given
> the recent changes to postinstall handling in setup, is there any reason
> we can't just stop ignoring the cygwin dep?

I'm not aware that this would have changed the dependency order.  Doing
this would probably require to postpone base package deps in general.
I'll have to do some things in setup to re-instate the possibility of
pruning an installation in unattended mode.  I'll have a look, but can't
promise I'll have enough time to get to the dependency issue.  Here's a
patch to fix that instance in cygport instead:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-lib-pkg_pkg.cygpart-Cygwin-is-at-version-2.x-now.patch --]
[-- Type: text/x-patch, Size: 958 bytes --]

From f4113a1776d35dd39ee3a3aa114495635782a300 Mon Sep 17 00:00:00 2001
From: Achim Gratz <Stromeko@Stromeko.DE>
Date: Thu, 7 May 2015 22:08:18 +0200
Subject: [PATCH] lib/pkg_pkg.cygpart: Cygwin is at version 2.x now...

---
 lib/pkg_pkg.cygpart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkg_pkg.cygpart b/lib/pkg_pkg.cygpart
index da8c9b2..acd4cf9 100644
--- a/lib/pkg_pkg.cygpart
+++ b/lib/pkg_pkg.cygpart
@@ -737,7 +737,7 @@ __pkg_dist() {
 			if [ "${CBUILD##*-}" = "cygwin" ]
 			then
 				pkg_bin_requires=$(__list_deps $(sort -fu ${T}/.${pkg_name[${n}]}.lst | sed -e '\|/$|d;s| |^_^|g') \
-						   | sort -fu | sed -e "/^cygwin-1/d;/^${pkg_name[${n}]}-[0-9].*$/d;s/-[0-9].*$//g" \
+						   | sort -fu | sed -e "/^cygwin-[12]/d;/^${pkg_name[${n}]}-[0-9].*$/d;s/-[0-9].*$//g" \
 						   | sed -e ':a;N;$!ba;s/\n/ /g')
 				__step "${pkg_name[${n}]} requires: ${pkg_bin_requires} ${!pkg_requires_var}"
 			else
-- 
2.3.7


[-- Attachment #3: Type: text/plain, Size: 197 bytes --]



Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

SD adaptations for KORG EX-800 and Poly-800MkII V0.9:
http://Synth.Stromeko.net/Downloads.html#KorgSDada

Re: cygport no longer removes "cygwin" from the dependency list

[Ken Brown]

On 5/8/2015 7:16 PM, Yaakov Selkowitz wrote:
> On Wed, 2015-05-06 at 14:33 -0400, Ken Brown wrote:
>> Now that we've moved from cygwin-1.7.x to cygwin-2.x.y, line 681 of
>> pkg_pkg.cygpart no longer filters out "cygwin".  Presumably you just
>> want to replace "cygwin-1" by "cygwin-2", unless there's a reason to
>> allow for the possibility that maintainers are building without having
>> the latest version of cygwin installed.
>
> Good catch.  OTOH, we were only skipping the 'cygwin' dep in setup.hint
> because of an issue with deptree ordering of postinstall scripts.  Given
> the recent changes to postinstall handling in setup, is there any reason
> we can't just stop ignoring the cygwin dep?

My understanding is that this had something to do with upset rather than 
setup.  upset apparently adds "cygwin" to the "requires:" line in 
setup.ini.  If "cygwin" also occurs in setup.hint, would this result in 
"cygwin" appearing twice?  In any case, I don't see an issue with 
setup.exe here.

Ken