Skip to contentSkip to conversation

pkg-stats: update set of files to skip

PATCH New Jerzy Grzegorek 3 participants 6 messages Sep 11, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 pkg-stats: update set of files to skip

In BR sub-directory boot/ linux/ and package/ there are a few .mk files which aren't <package>.mk files. These files shouldn't be taken into account in package statistics.

---
 support/scripts/pkg-stats |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)
support/scripts/pkg-stats +10 -7
index a65a6ae..4effa59 100755
@@ -87,18 +87,21 @@ for i in $(find boot/ linux/ package/ -name '*.mk' | sort) ; do
 	$i = "boot/common.mk" -o \
 	$i = "linux/linux-ext-xenomai.mk" -o \
 	$i = "linux/linux-ext-rtai.mk" -o \
-	$i = "linux/linux-ext-ocf-linux.mk" -o \
 	$i = "package/efl/efl.mk" -o \
-	$i = "package/games/games.mk" -o \
+	$i = "package/freescale-imx/freescale-imx.mk" -o \
+	$i = "package/gcc/gcc.mk" -o \
+	$i = "package/gstreamer/gstreamer.mk" -o \
+	$i = "package/gstreamer1/gstreamer1.mk" -o \
 	$i = "package/gtk2-themes/gtk2-themes.mk" -o \
-	$i = "package/multimedia/multimedia.mk" -o \
+	$i = "package/matchbox/matchbox.mk" -o \
+	$i = "package/opengl/opengl.mk" -o \
+	$i = "package/qt5/qt5.mk" -o \
+	$i = "package/x11r7/x11r7.mk" -o \
  	$i = "package/pkg-autotools.mk" -o \
  	$i = "package/pkg-cmake.mk" -o \
+	$i = "package/pkg-download.mk" -o \
  	$i = "package/pkg-generic.mk" -o \
- 	$i = "package/pkg-utils.mk" -o \
- 	$i = "package/pkg-download.mk" -o \
-	$i = "package/matchbox/matchbox.mk" -o \
-	$i = "package/x11r7/x11r7.mk" ; then
+ 	$i = "package/pkg-utils.mk" ; then
 	echo "skipping $i" 1>&2
 	continue
     fi
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 2/2 pkg-stats: fix proper identification of package infrastructure

Typically each package invokes the macro which generates the Makefile code, in the way like this: e.g. $(eval $(generic-package)) or $(eval $(autotools-package)) , but a few packages have to invoke this macro in other way:
$(eval $(call generic-package)) e.g. dhcpcd.mk
$(eval $(call autotools-package)) e.g. wireshark.mk .
This patch make changes to fix proper identification of package infrastructure.

---
 support/scripts/pkg-stats |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
support/scripts/pkg-stats +2 -2
index 4effa59..e982d9c 100755
@@ -118,7 +118,7 @@ for i in $(find boot/ linux/ package/ -name '*.mk' | sort) ; do
 	hashost=1
     fi
 
-    if grep -E "\(autotools-package\)" $i > /dev/null ; then
+    if grep -E "autotools-package\)" $i > /dev/null ; then
 	infratype="autotools"
 	hastarget=1
     fi
@@ -128,7 +128,7 @@ for i in $(find boot/ linux/ package/ -name '*.mk' | sort) ; do
 	hashost=1
     fi
 
-    if grep -E "\(generic-package\)" $i > /dev/null ; then
+    if grep -E "generic-package\)" $i > /dev/null ; then
 	infratype="generic"
 	hastarget=1
     fi
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 2/2 pkg-stats: fix proper identification of package infrastructure

Hi,

Quoted 5 lines · Jerzy Grzegorek

Typically each package invokes the macro which generates the Makefile code, in the way like this: e.g. $(eval $(generic-package)) or $(eval $(autotools-package)) , but a few packages have to invoke this macro in other way:
$(eval $(call generic-package)) e.g. dhcpcd.mk
$(eval $(call autotools-package)) e.g. wireshark.mk .

I rather think that the 'call' is an accident. Arnout removed the need for the extra $(call) in July 2012, with commit e1502ebc0c92763896c53d405ee9c7c7a1a33e24, and both dhcpcd and wireshark were added after that time. So I think this has been missed during code review.

A quick search shows only three packages with a remaining $(eval $(call)) construct: dhcpcd, wireshark, jquery-keyboard. So I'd rather fix those packages...

Best regards,
Thomas

#3 lore raw

PATCH 2/2 pkg-stats: fix proper identification of package infrastructure

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas De Schampheleire <[email protected]> writes:

Thomas> Hi,
Thomas> On Wed, Sep 11, 2013 at 11:12 AM, Jerzy Grzegorek

Quoted 5 lines · Thomas> <[email protected]> wrote:
Quoted 5 lines

Typically each package invokes the macro which generates the Makefile code, in the way like this: e.g. $(eval $(generic-package)) or $(eval $(autotools-package)) , but a few packages have to invoke this macro in other way:
$(eval $(call generic-package)) e.g. dhcpcd.mk
$(eval $(call autotools-package)) e.g. wireshark.mk .

Thomas> I rather think that the 'call' is an accident. Arnout removed the need Thomas> for the extra $(call) in July 2012, with commit
Thomas> e1502ebc0c92763896c53d405ee9c7c7a1a33e24, and both dhcpcd and Thomas> wireshark were added after that time. So I think this has been missed Thomas> during code review.

Thomas> A quick search shows only three packages with a remaining $(eval Thomas> $(call)) construct: dhcpcd, wireshark, jquery-keyboard. Thomas> So I'd rather fix those packages...

Agreed, I've fixed those in git now.

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 2/2 pkg-stats: fix proper identification of package infrastructure

In reply to Thomas De Schampheleire

Hi Thomas,

Thanks for the feedback.

Quoted 15 lines

Hi,

Quoted 5 lines · Jerzy Grzegorek

Typically each package invokes the macro which generates the Makefile code, in the way like this: e.g. $(eval $(generic-package)) or $(eval $(autotools-package)) , but a few packages have to invoke this macro in other way:
$(eval $(call generic-package)) e.g. dhcpcd.mk
$(eval $(call autotools-package)) e.g. wireshark.mk .

I rather think that the 'call' is an accident. Arnout removed the need for the extra $(call) in July 2012, with commit e1502ebc0c92763896c53d405ee9c7c7a1a33e24, and both dhcpcd and wireshark were added after that time. So I think this has been missed during code review.

Quoted 3 lines

A quick search shows only three packages with a remaining $(eval $(call)) construct: dhcpcd, wireshark, jquery-keyboard. So I'd rather fix those packages...

Ah, I understand now.

Regards,
Jerzy

Quoted 4 lines

Best regards,
Thomas

#5 lore raw

PATCH 1/2 pkg-stats: update set of files to skip

In reply to Jerzy Grzegorek
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Jerzy" == Jerzy Grzegorek <[email protected]> writes:

Jerzy> In BR sub-directory boot/ linux/ and package/ there are a few .mk files which Jerzy> aren't <package>.mk files. These files shouldn't be taken into account Jerzy> in package statistics.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard