From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from ams-iport-4.cisco.com ([144.254.224.147]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1TEa6m-000264-Jr for openembedded-core@lists.openembedded.org; Thu, 20 Sep 2012 08:19:32 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=4440; q=dns/txt; s=iport; t=1348121212; x=1349330812; h=message-id:date:from:mime-version:to:cc:subject: references:in-reply-to:content-transfer-encoding; bh=NU1HzII6jXPayNKak12mQhNJIF13BxoW165apgG0K/o=; b=ixxUKi31xjuPeat8TErtODX4bhDFjGhgKzac57gbEp1nHDE7yyYgKwY1 nNN4vgaZ4Egqqok7cO/SR0Znqzpl2OSPYBzfxjPBnyUiVmMaZaknaGsWt wAPjlWQNgJUOMmrVLspX/Nh3/CMp6ZwCIlfsXgOGtd7on4qN9FD3bu5/e I=; X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av8EAPyxWlCQ/khN/2dsb2JhbABFFrx3gQiCIAEBAQQSATgBLRALDgoJJQ8CRgYNAQUCAQEeh2ELmXmRVwGOK4schkEDlWSBFIRMiFiBaYJo X-IronPort-AV: E=Sophos;i="4.80,453,1344211200"; d="scan'208";a="8177655" Received: from ams-core-4.cisco.com ([144.254.72.77]) by ams-iport-4.cisco.com with ESMTP; 20 Sep 2012 06:06:49 +0000 Received: from [10.54.74.11] (dhcp-10-54-74-11.cisco.com [10.54.74.11]) by ams-core-4.cisco.com (8.14.5/8.14.5) with ESMTP id q8K66m04004197; Thu, 20 Sep 2012 06:06:49 GMT Message-ID: <505AB23E.10607@cisco.com> Date: Thu, 20 Sep 2012 08:05:50 +0200 From: =?ISO-8859-1?Q?Martin_Erts=E5s?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.7) Gecko/20120911 Thunderbird/10.0.7 MIME-Version: 1.0 To: Saul Wold References: <1348039015-27100-1-git-send-email-mertsas@cisco.com> <5059DE91.9060709@linux.intel.com> In-Reply-To: <5059DE91.9060709@linux.intel.com> Cc: openembedded-core@lists.openembedded.org Subject: Re: [PATCH v2] bash: Make it possible to run bash 3.2.48 instead of 4.2. X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Sep 2012 06:19:32 -0000 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit On 09/19/12 17:02, Saul Wold wrote: > On 09/19/2012 12:16 AM, Martin Ertsaas wrote: >> bash-3.2.48 did not provide the linking from sh to bash, making it >> unusable. >> Moving the license part out of the bash.inc file, and into >> bash_4.2.bb file makes >> us able to use that file also for bash_3.2.48.bb, which makes >> maintaining both >> at the same time a lot easier. >> > This is good, but I forgot to ask you to include the size change in > here, it's helpful for tracking, I am still considering this change, > but we have constantly adding little change like this adds up to bigger > change. > > Is there any other way to do the equivalent of what you are attempting > to do in the other patch without adding size to busy box? > > Thanks > > Sau! What size change is that? I'm not sure what you are referring to here, sorry. As far as I see I'm not adding any size to busybox either, but I might be wrong as I don't know the internals of busybox. If you could elaborate a bit more, I can see what I can do about your concerns. - Martin > >> Signed-off-by: Martin Ertsaas >> --- >> meta/recipes-extended/bash/bash.inc | 3 -- >> meta/recipes-extended/bash/bash_3.2.48.bb | 31 >> +--------------------------- >> meta/recipes-extended/bash/bash_4.2.bb | 6 ++++- >> 3 files changed, 7 insertions(+), 33 deletions(-) >> >> diff --git a/meta/recipes-extended/bash/bash.inc >> b/meta/recipes-extended/bash/bash.inc >> index 3684191..ae4b681 100644 >> --- a/meta/recipes-extended/bash/bash.inc >> +++ b/meta/recipes-extended/bash/bash.inc >> @@ -2,9 +2,6 @@ DESCRIPTION = "An sh-compatible command language >> interpreter." >> HOMEPAGE = "http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html" >> SECTION = "base/shell" >> >> -# GPLv2+ (< 4.0), GPLv3+ (>= 4.0) >> -LICENSE = "GPLv3+" >> -LIC_FILES_CHKSUM = >> "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" >> DEPENDS = "ncurses bison-native" >> >> inherit autotools gettext update-alternatives >> diff --git a/meta/recipes-extended/bash/bash_3.2.48.bb >> b/meta/recipes-extended/bash/bash_3.2.48.bb >> index 509d7a0..828d629 100644 >> --- a/meta/recipes-extended/bash/bash_3.2.48.bb >> +++ b/meta/recipes-extended/bash/bash_3.2.48.bb >> @@ -1,12 +1,9 @@ >> -DESCRIPTION = "An sh-compatible command language interpreter." >> -HOMEPAGE = "http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html" >> -SECTION = "base/shell" >> +require bash.inc >> >> LICENSE = "GPLv2+" >> LIC_FILES_CHKSUM = >> "file://COPYING;md5=fd5d9bcabd8ed5a54a01ce8d183d592a" >> -DEPENDS = "ncurses" >> >> -PR = "r10" >> +PR = "r11" >> >> SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz;name=tarball \ >> >> ${GNU_MIRROR}/bash/bash-3.2-patches/bash32-049;apply=yes;striplevel=0;name=patch001 >> \ >> @@ -24,27 +21,3 @@ SRC_URI[patch003.sha256sum] = >> "354886097cd95b4def77028f32ee01e2e088d58a98184fede >> >> SRC_URI[md5sum] = "338dcf975a93640bb3eaa843ca42e3f8" >> SRC_URI[sha256sum] = >> "128d281bd5682ba5f6953122915da71976357d7a76490d266c9173b1d0426348" >> - >> -inherit autotools gettext >> - >> -PARALLEL_MAKE = "" >> - >> -bindir = "/bin" >> -sbindir = "/sbin" >> - >> -EXTRA_OECONF = "--with-ncurses" >> -export CC_FOR_BUILD = "${BUILD_CC}" >> - >> -export AUTOHEADER = "true" >> - >> -do_configure_prepend () { >> - if [ ! -e acinclude.m4 ]; then >> - cat aclocal.m4 > acinclude.m4 >> - fi >> -} >> - >> -pkg_postinst_${PN} () { >> - touch $D${sysconfdir}/shells >> - grep -q "bin/bash" $D${sysconfdir}/shells || echo /bin/bash >> >> $D${sysconfdir}/shells >> - grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> >> $D${sysconfdir}/shells >> -} >> diff --git a/meta/recipes-extended/bash/bash_4.2.bb >> b/meta/recipes-extended/bash/bash_4.2.bb >> index 384eb62..5a0f015 100644 >> --- a/meta/recipes-extended/bash/bash_4.2.bb >> +++ b/meta/recipes-extended/bash/bash_4.2.bb >> @@ -1,6 +1,10 @@ >> require bash.inc >> >> -PR = "r4" >> +# GPLv2+ (< 4.0), GPLv3+ (>= 4.0) >> +LICENSE = "GPLv3+" >> +LIC_FILES_CHKSUM = >> "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" >> + >> +PR = "r5" >> >> SRC_URI = "${GNU_MIRROR}/bash/${BPN}-${PV}.tar.gz;name=tarball \ >> >> ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-001;apply=yes;striplevel=0;name=patch001 >> \ >>