Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] <package>_VER vs <package>_VERSION
@ 2007-07-07 14:10 Ulf Samuelsson
  2007-07-07 15:49 ` Steven J. Hill
  0 siblings, 1 reply; 7+ messages in thread
From: Ulf Samuelsson @ 2007-07-07 14:10 UTC (permalink / raw)
  To: buildroot

Some packages use <package>_VER  and some use  <package>_VERSION
and some does not use this at all and hardcodes the version.

Suggest we clean this up so we use a single template.

Suggest we do it using the following template, allowing user to override.

ifeq    ($(<package>_VERSION),)
<package>_VERSION:=X.Y.Z
endif

Best Regards
Ulf Samuelsson

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [Buildroot] <package>_VER vs <package>_VERSION
  2007-07-07 14:10 [Buildroot] <package>_VER vs <package>_VERSION Ulf Samuelsson
@ 2007-07-07 15:49 ` Steven J. Hill
  2007-07-07 19:33   ` Ulf Samuelsson
  0 siblings, 1 reply; 7+ messages in thread
From: Steven J. Hill @ 2007-07-07 15:49 UTC (permalink / raw)
  To: buildroot

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Ulf Samuelsson wrote:
> Some packages use <package>_VER  and some use  <package>_VERSION
> and some does not use this at all and hardcodes the version.
> 
> Suggest we clean this up so we use a single template.
> 
> Suggest we do it using the following template, allowing user to override.
> 
> ifeq    ($(<package>_VERSION),)
> <package>_VERSION:=X.Y.Z
> endif
> 
That's an interesting idea. I agree on the _VER and _VERSION clean-up. How
about you submit a patch for that first? Thanks.

- -Steve
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGj7X0gyK5H2Ic36cRAu92AJ4mfebEMjXncg6Kowy2WqmBx3DoggCgnnbd
8dee0MadkFPEocP/w+jb/3c=
=9bR2
-----END PGP SIGNATURE-----

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [Buildroot] <package>_VER vs <package>_VERSION
  2007-07-07 15:49 ` Steven J. Hill
@ 2007-07-07 19:33   ` Ulf Samuelsson
  2007-07-07 19:43     ` Ulf Samuelsson
  2007-07-07 21:07     ` Bernhard Fischer
  0 siblings, 2 replies; 7+ messages in thread
From: Ulf Samuelsson @ 2007-07-07 19:33 UTC (permalink / raw)
  To: buildroot

l?r 2007-07-07 klockan 10:49 -0500 skrev Steven J. Hill:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Ulf Samuelsson wrote:
> > Some packages use <package>_VER  and some use  <package>_VERSION
> > and some does not use this at all and hardcodes the version.
> > 
> > Suggest we clean this up so we use a single template.
> > 
> > Suggest we do it using the following template, allowing user to override.
> > 
> > ifeq    ($(<package>_VERSION),)
> > <package>_VERSION:=X.Y.Z
> > endif
> > 
> That's an interesting idea. I agree on the _VER and _VERSION clean-up. How
> about you submit a patch for that first? Thanks.
> 
> - -Steve

Some packages do not have a version:
customize
gnuconfig
hostap		Always use a snapshot
microcom	This is not clean, version = 1.02, 
		package is m102.tar.gz
jpeg	   	6b vs v6b
mtd		Configurable from menuconfig or snapshot
sfdisk		No version, this is located on www.uclibc.org so we 
		should change to sfdisk-1.00.tar.bz2
tinylogin	Makefile force use of snapshot,
		Configure using menuconfig?
ttcp		No version

Index: package/l2tp/l2tp.mk
===================================================================
--- package/l2tp/l2tp.mk	(revision 19021)
+++ package/l2tp/l2tp.mk	(arbetskopia)
@@ -33,7 +33,7 @@
 	touch $(L2TP_DIR)/.unpacked
 
 $(L2TP_DIR)/$(L2TP_BINARY): $(L2TP_DIR)/.unpacked
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(L2TP_DIR) CC=$(TARGET_CC) \
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(L2TP_DIR) \
 		DFLAGS= \
 		OSFLAGS="-DLINUX -UUSE_KERNEL $(TARGET_CFLAGS) -USANITY"
 
Index: package/mtd/mtd.mk
===================================================================
--- package/mtd/mtd.mk	(revision 19021)
+++ package/mtd/mtd.mk	(arbetskopia)
@@ -115,7 +115,10 @@
 MTD_BUILD_TARGETS := $(addprefix $(MTD_DIR)/util/, $(MTD_TARGETS_y))
 
 $(MTD_BUILD_TARGETS): $(MTD_DIR)/.unpacked
-	$(TARGET_CONFIGURE_OPTS) $(MAKE)	CFLAGS="-I$(MTD_DIR)/include -I
$(LINUX_HEADERS_DIR)/include" LINUXDIR=$(LINUX_DIR) -C $(MTD_DIR)/util
+	$(MAKE)	$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="-I$(MTD_DIR)/include \
+		-I$(LINUX_HEADERS_DIR)/include" \
+		LINUXDIR=$(LINUX_DIR) -C $(MTD_DIR)/util
 
 MTD_TARGETS := $(addprefix $(TARGET_DIR)/usr/sbin/, $(MTD_TARGETS_y))
 
Index: package/qte/qte.mk
===================================================================
--- package/qte/qte.mk	(revision 19021)
+++ package/qte/qte.mk	(arbetskopia)
@@ -222,18 +222,18 @@
 
 $(QTE_QTE_LIB): $(QTE_QTE_DIR)/src-mt.mk
 	export QTDIR=$(QTE_QTE_DIR); export QPEDIR=$(QTE_QTOPIA_DIR); export
PATH=$(STAGING_DIR)/bin:$$QTDIR/bin:$$PATH; \
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) $(TARGET_CC) -C $(QTE_QTE_DIR) src-mt
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) $(TARGET_CC) DESTDIR=
$(TARGET_DIR)/lib -C $(QTE_QTE_DIR) src-mt
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) $(TARGET_CC) -C $(QTE_QTE_DIR) src-mt
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) $(TARGET_CC) DESTDIR=
$(TARGET_DIR)/lib -C $(QTE_QTE_DIR) src-mt
 	# ... and make sure it actually built... grrr... make deep-deep-deep
makefile recursion for this habit
 	test -f $@
 
 $(QTE_QTOPIA_FILE): $(QTE_QTOPIA_DIR)/.configured
 	export QTDIR=$(QTE_QT3_DIR); export QPEDIR=$(QTE_QTOPIA_DIR); export
PATH=$(STAGING_DIR)/bin:$$QTDIR/bin:$$PATH; \
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(QTE_QTOPIA_DIR)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(QTE_QTOPIA_DIR)
 
 $(QTE_QTOPIA_IFILE): $(QTE_QTOPIA_FILE)
 	export QTDIR=$(QTE_QT3_DIR); export QPEDIR=$(QTE_QTOPIA_DIR); export
PATH=$(STAGING_DIR)/bin:$$QTDIR/bin:$$PATH; \
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(QTE_QTOPIA_DIR)
install PREFIX=$(TARGET_DIR)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(QTE_QTOPIA_DIR) install PREFIX=
$(TARGET_DIR)
 
 
 qte:: $(QTE_QTE_LIB)
Index: package/kexec/kexec.mk
===================================================================
--- package/kexec/kexec.mk	(revision 19021)
+++ package/kexec/kexec.mk	(arbetskopia)
@@ -53,7 +53,7 @@
 	touch $@
 
 $(KEXEC_DIR)/objdir-$(GNU_TARGET_NAME)/build/sbin/$(KEXEC_BINARY):
$(KEXEC_DIR)/.configured
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(KEXEC_DIR)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(KEXEC_DIR)
 	touch -c $@
 
 $(TARGET_DIR)/$(KEXEC_TARGET_BINARY):
$(KEXEC_DIR)/objdir-$(GNU_TARGET_NAME)/build/sbin/$(KEXEC_BINARY)
Index: package/usbutils/usbutils.mk
===================================================================
--- package/usbutils/usbutils.mk	(revision 19021)
+++ package/usbutils/usbutils.mk	(arbetskopia)
@@ -35,7 +35,7 @@
 	touch $(USBUTILS_DIR)/.configured
 
 $(USBUTILS_DIR)/$(USBUTILS_BINARY): $(USBUTILS_DIR)/.configured
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(USBUTILS_DIR)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(USBUTILS_DIR)
 
 $(TARGET_DIR)/$(USBUTILS_TARGET_BINARY):
$(USBUTILS_DIR)/$(USBUTILS_BINARY)
 	$(MAKE) -C $(USBUTILS_DIR) DESTDIR=$(TARGET_DIR) install
Index: package/netcat/netcat.mk
===================================================================
--- package/netcat/netcat.mk	(revision 19021)
+++ package/netcat/netcat.mk	(arbetskopia)
@@ -35,7 +35,7 @@
 
 
 $(NETCAT_DIR)/$(NETCAT_BINARY): $(NETCAT_DIR)/.configured
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(NETCAT_DIR)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(NETCAT_DIR)
 
 $(TARGET_DIR)/$(NETCAT_TARGET_BINARY): $(NETCAT_DIR)/$(NETCAT_BINARY)
 	install -D $(NETCAT_DIR)/$(NETCAT_BINARY)
$(TARGET_DIR)/$(NETCAT_TARGET_BINARY)
Index: package/tinyx/tinyx.mk
===================================================================
--- package/tinyx/tinyx.mk	(revision 19021)
+++ package/tinyx/tinyx.mk	(arbetskopia)
@@ -85,7 +85,7 @@
 	rm -f $(TINYX_BINX)/Xfbdev
 	#make World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=<cross compiler dir>";
 	#( cd $(TINYX_DIR) ; $(MAKE) World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=
$(STAGING_DIR)/bin" )
-	#( cd $(TINYX_DIR) ; $(TARGET_CONFIGURE_OPTS) $(MAKE) World )
+	#( cd $(TINYX_DIR) ; $(MAKE) $(TARGET_CONFIGURE_OPTS) World )
 	#
 	#mv $(TINYX_DIR)/Makefile $(TINYX_DIR)/Makefile.xxxx
 	#echo "AS=$(TARGET_CROSS)as" > $(TINYX_DIR)/Makefile
Index: package/rsync/rsync.mk
===================================================================
--- package/rsync/rsync.mk	(revision 19021)
+++ package/rsync/rsync.mk	(arbetskopia)
@@ -35,7 +35,7 @@
 	touch $(RSYNC_DIR)/.configured
 
 $(RSYNC_DIR)/$(RSYNC_BINARY): $(RSYNC_DIR)/.configured
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(RSYNC_DIR)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(RSYNC_DIR)
 
 $(TARGET_DIR)/$(RSYNC_TARGET_BINARY): $(RSYNC_DIR)/$(RSYNC_BINARY)
 	install -D $(RSYNC_DIR)/$(RSYNC_BINARY)
$(TARGET_DIR)/$(RSYNC_TARGET_BINARY)
Index: package/samba/samba.mk
===================================================================
--- package/samba/samba.mk	(revision 19021)
+++ package/samba/samba.mk	(arbetskopia)
@@ -46,7 +46,7 @@
 	touch $(SAMBA_DIR)/.configured
 
 $(SAMBA_DIR)/$(SAMBA_BINARY): $(SAMBA_DIR)/.configured
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(SAMBA_DIR)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(SAMBA_DIR)
 
 SAMBA_TARGETS_ :=
 SAMBA_TARGETS_y :=
@@ -79,7 +79,7 @@
 SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_WBINFO)	+= usr/bin/wbinfo
 
 $(TARGET_DIR)/$(SAMBA_TARGET_BINARY): $(SAMBA_DIR)/$(SAMBA_BINARY)
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC)	\
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) 	\
 		prefix="${TARGET_DIR}/usr" \
 		BASEDIR="${TARGET_DIR}/usr" \
 		SBINDIR="${TARGET_DIR}/usr/sbin" \
Index: package/flex/flex.mk
===================================================================
--- package/flex/flex.mk	(revision 19021)
+++ package/flex/flex.mk	(arbetskopia)
@@ -58,7 +58,7 @@
 	touch $@
 
 $(FLEX_DIR)/$(FLEX_BINARY): $(FLEX_DIR)/.configured
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(FLEX_DIR)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(FLEX_DIR)
 
 $(TARGET_DIR)/$(FLEX_TARGET_BINARY): $(FLEX_DIR)/$(FLEX_BINARY)
 	$(MAKE1) \
Index: package/quagga/quagga.mk
===================================================================
--- package/quagga/quagga.mk	(revision 19021)
+++ package/quagga/quagga.mk	(arbetskopia)
@@ -152,7 +152,7 @@
 	touch $@
 
 $(QUAGGA_BINARY): $(QUAGGA_DIR)/.configured
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(QUAGGA_DIR)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(QUAGGA_DIR)
 
 $(TARGET_DIR)/usr/sbin/$(QUAGGA_TARGET_BINARY): $(QUAGGA_BINARY)
 	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(QUAGGA_DIR) install
Index: package/thttpd/thttpd.mk
===================================================================
--- package/thttpd/thttpd.mk	(revision 19021)
+++ package/thttpd/thttpd.mk	(arbetskopia)
@@ -35,7 +35,7 @@
 	touch $(THTTPD_DIR)/.configured
 
 $(THTTPD_DIR)/$(THTTPD_BINARY): $(THTTPD_DIR)/.configured
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(THTTPD_DIR)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(THTTPD_DIR)
 
 $(TARGET_DIR)/$(THTTPD_TARGET_BINARY): $(THTTPD_DIR)/$(THTTPD_BINARY)
 	install -D $(THTTPD_DIR)/$(THTTPD_BINARY)
$(TARGET_DIR)/$(THTTPD_TARGET_BINARY)
Index: package/libevent/libevent.mk
===================================================================
--- package/libevent/libevent.mk	(revision 19021)
+++ package/libevent/libevent.mk	(arbetskopia)
@@ -37,7 +37,7 @@
 	touch $@
 
 $(LIBEVENT_DIR)/$(LIBEVENT_BINARY): $(LIBEVENT_DIR)/.configured
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(LIBEVENT_DIR)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(LIBEVENT_DIR)
 
 $(STAGING_DIR)/$(LIBEVENT_TARGET_BINARY):
$(LIBEVENT_DIR)/$(LIBEVENT_BINARY)
 	$(MAKE) -C $(LIBEVENT_DIR) DESTDIR=$(STAGING_DIR) install
Index: package/microcom/microcom.mk
===================================================================
--- package/microcom/microcom.mk	(revision 19021)
+++ package/microcom/microcom.mk	(arbetskopia)
@@ -51,7 +51,7 @@
 	 	$(CFLAGS_WHOLE_PROGRAM) -o $@ $(wildcard $(MICROCOM_DIR)/*.c); \
 	)
 else
-	$(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS)" $(MAKE) -C
$(MICROCOM_DIR)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS)" -C
$(MICROCOM_DIR)
 endif
 	$(STRIP) -s $@
 
Index: package/wget/wget.mk
===================================================================
--- package/wget/wget.mk	(revision 19021)
+++ package/wget/wget.mk	(arbetskopia)
@@ -36,7 +36,7 @@
 	touch $(WGET_DIR)/.configured
 
 $(WGET_DIR)/$(WGET_BINARY): $(WGET_DIR)/.configured
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(WGET_DIR)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(WGET_DIR)
 
 $(TARGET_DIR)/$(WGET_TARGET_BINARY): $(WGET_DIR)/$(WGET_BINARY)
 	install -D $(WGET_DIR)/$(WGET_BINARY)
$(TARGET_DIR)/$(WGET_TARGET_BINARY)
Index: package/argus/argus.mk
===================================================================
--- package/argus/argus.mk	(revision 19021)
+++ package/argus/argus.mk	(arbetskopia)
@@ -45,7 +45,7 @@
 	touch $@
 
 $(ARGUS_DIR)/$(ARGUS_BINARY): $(ARGUS_DIR)/.configured
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(ARGUS_DIR)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(ARGUS_DIR)
 
 $(TARGET_DIR)/$(ARGUS_TARGET_BINARY): $(ARGUS_DIR)/$(ARGUS_BINARY)
 	cp -dpf $(ARGUS_DIR)/$(ARGUS_BINARY) $@
Index: package/libusb/libusb.mk
===================================================================
--- package/libusb/libusb.mk	(revision 19021)
+++ package/libusb/libusb.mk	(arbetskopia)
@@ -36,7 +36,7 @@
 	touch $(LIBUSB_DIR)/.configured
 
 $(STAGING_DIR)/$(LIBUSB_BINARY): $(LIBUSB_DIR)/.configured
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(LIBUSB_DIR)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(LIBUSB_DIR)
 	$(MAKE) -C $(LIBUSB_DIR) DESTDIR=$(STAGING_DIR) install
 
 $(TARGET_DIR)/$(LIBUSB_BINARY): $(STAGING_DIR)/$(LIBUSB_BINARY)
Index: package/qtopia4/qtopia4.mk
===================================================================
--- package/qtopia4/qtopia4.mk	(revision 19021)
+++ package/qtopia4/qtopia4.mk	(arbetskopia)
@@ -161,7 +161,7 @@
 	touch $(QTOPIA4_TARGET_DIR)/.configured
 
 $(QTOPIA4_TARGET_DIR)/lib/libQtCore.so.$(QTOPIA4_VER):
$(QTOPIA4_TARGET_DIR)/.configured
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) \
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
 		-C $(QTOPIA4_TARGET_DIR) sub-src
 
 $(STAGING_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VER):
$(QTOPIA4_TARGET_DIR)/lib/libQtCore.so.$(QTOPIA4_VER)
Index: package/nano/nano.mk
===================================================================
--- package/nano/nano.mk	(revision 19021)
+++ package/nano/nano.mk	(arbetskopia)
@@ -35,7 +35,7 @@
 	touch $(NANO_DIR)/.configured
 
 $(NANO_DIR)/$(NANO_BINARY): $(NANO_DIR)/.configured
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(NANO_DIR)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(NANO_DIR)
 
 $(TARGET_DIR)/$(NANO_TARGET_BINARY): $(NANO_DIR)/$(NANO_BINARY)
 	install -D $(NANO_DIR)/$(NANO_BINARY)
$(TARGET_DIR)/$(NANO_TARGET_BINARY)
Index: package/procps/procps.mk
===================================================================
--- package/procps/procps.mk	(revision 19021)
+++ package/procps/procps.mk	(arbetskopia)
@@ -22,7 +22,7 @@
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(PROCPS_DIR)
 
 $(TARGET_DIR)/$(PROCPS_TARGET_BINARY): $(PROCPS_DIR)/$(PROCPS_BINARY)
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) DESTDIR=$(TARGET_DIR) \
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \
 		install='install -D' -C $(PROCPS_DIR) lib64=/lib \
 		ldconfig='/bin/true' install
 	rm -Rf $(TARGET_DIR)/usr/share/man
Index: package/distcc/distcc.mk
===================================================================
--- package/distcc/distcc.mk	(revision 19021)
+++ package/distcc/distcc.mk	(arbetskopia)
@@ -45,7 +45,7 @@
 	touch $(DISTCC_DIR)/.configured
 
 $(DISTCC_DIR)/$(DISTCC_BINARY): $(DISTCC_DIR)/.configured
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(DISTCC_DIR)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(DISTCC_DIR)
 
 $(TARGET_DIR)/$(DISTCC_TARGET_BINARY): $(DISTCC_DIR)/$(DISTCC_BINARY)
 	install -D $(DISTCC_DIR)/$(DISTCC_BINARY)d
$(TARGET_DIR)/$(DISTCC_TARGET_BINARY)d



Best Regards
Ulf Samuelsson

-------------- next part --------------
A non-text attachment was scrubbed...
Name: TARGET_CONFIGURE_OPTS-2.patch
Type: text/x-patch
Size: 12722 bytes
Desc: not available
Url : http://busybox.net/lists/buildroot/attachments/20070707/34deedea/attachment-0001.bin 

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [Buildroot] <package>_VER vs <package>_VERSION
  2007-07-07 19:33   ` Ulf Samuelsson
@ 2007-07-07 19:43     ` Ulf Samuelsson
  2007-07-08  0:42       ` Bernhard Fischer
  2007-07-07 21:07     ` Bernhard Fischer
  1 sibling, 1 reply; 7+ messages in thread
From: Ulf Samuelsson @ 2007-07-07 19:43 UTC (permalink / raw)
  To: buildroot

l?r 2007-07-07 klockan 21:33 +0200 skrev Ulf Samuelsson:
> l?r 2007-07-07 klockan 10:49 -0500 skrev Steven J. Hill:
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA1
> > 
> > Ulf Samuelsson wrote:
> > > Some packages use <package>_VER  and some use  <package>_VERSION
> > > and some does not use this at all and hardcodes the version.
> > > 
> > > Suggest we clean this up so we use a single template.
> > > 
> > > Suggest we do it using the following template, allowing user to override.
> > > 
> > > ifeq    ($(<package>_VERSION),)
> > > <package>_VERSION:=X.Y.Z
> > > endif
> > > 
> > That's an interesting idea. I agree on the _VER and _VERSION clean-up. How
> > about you submit a patch for that first? Thanks.
> > 
> > - -Steve
> 
> Some packages do not have a version:
> customize
> gnuconfig
> hostap		Always use a snapshot
> microcom	This is not clean, version = 1.02, 
> 		package is m102.tar.gz
> jpeg	   	6b vs v6b
> mtd		Configurable from menuconfig or snapshot
> sfdisk		No version, this is located on www.uclibc.org so we 
> 		should change to sfdisk-1.00.tar.bz2
> tinylogin	Makefile force use of snapshot,
> 		Configure using menuconfig?
> ttcp		No version

Now with the correct attachment (zipped, to meet list limit)
Sorry about the confusing mess in the previous emails, getting tired...

> 
> Best Regards
> Ulf Samuelsson
> 
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot
-------------- next part --------------
A non-text attachment was scrubbed...
Name: VERSION.patch.tar.bz2
Type: application/x-bzip-compressed-tar
Size: 13886 bytes
Desc: not available
Url : http://busybox.net/lists/buildroot/attachments/20070707/7b4fb310/attachment.bin 

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [Buildroot] <package>_VER vs <package>_VERSION
  2007-07-07 19:33   ` Ulf Samuelsson
  2007-07-07 19:43     ` Ulf Samuelsson
@ 2007-07-07 21:07     ` Bernhard Fischer
  2007-07-07 22:19       ` Ulf Samuelsson
  1 sibling, 1 reply; 7+ messages in thread
From: Bernhard Fischer @ 2007-07-07 21:07 UTC (permalink / raw)
  To: buildroot

On Sat, Jul 07, 2007 at 09:33:26PM +0200, Ulf Samuelsson wrote:
>l?r 2007-07-07 klockan 10:49 -0500 skrev Steven J. Hill:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>> 
>> Ulf Samuelsson wrote:
>> > Some packages use <package>_VER  and some use  <package>_VERSION
>> > and some does not use this at all and hardcodes the version.
>> > 
>> > Suggest we clean this up so we use a single template.
>> > 
>> > Suggest we do it using the following template, allowing user to override.
>> > 
>> > ifeq    ($(<package>_VERSION),)
>> > <package>_VERSION:=X.Y.Z
>> > endif
>> > 
>> That's an interesting idea. I agree on the _VER and _VERSION clean-up. How
>> about you submit a patch for that first? Thanks.
>> 
>> - -Steve
>
>Some packages do not have a version:
>customize

I'd remove that one, but i guess you're opposed to that ;)

>gnuconfig

That's just CVS (nothing interresting was changed there, i looked about
three weeks ago).

>hostap		Always use a snapshot
>microcom	This is not clean, version = 1.02, 
>		package is m102.tar.gz

"clean", well, live with it until an upstream maintainer fixes this
cosmetic issue.

>jpeg	   	6b vs v6b

about the same as microcom

>mtd		Configurable from menuconfig or snapshot
>sfdisk		No version, this is located on www.uclibc.org so we 
>		should change to sfdisk-1.00.tar.bz2

1.00 is inappropriate. Either use the official version from util-linux
or implement a _small_ sfdisk in busybox (but we already have fdisk,
IIRC) or leave it alone, IMHO.

>tinylogin	Makefile force use of snapshot,
>		Configure using menuconfig?

standalone tinylogin is deprecated and unmaintained from my POV (use
busybox which is actively maintained).

>ttcp		No version

"No version" depends on you view. It clearly reads
"ttcp.c $Revision: 1.12 $";

>Index: package/qte/qte.mk
>===================================================================
>--- package/qte/qte.mk	(revision 19021)
>+++ package/qte/qte.mk	(arbetskopia)
>@@ -222,18 +222,18 @@
> 
> $(QTE_QTE_LIB): $(QTE_QTE_DIR)/src-mt.mk
> 	export QTDIR=$(QTE_QTE_DIR); export QPEDIR=$(QTE_QTOPIA_DIR); export
>PATH=$(STAGING_DIR)/bin:$$QTDIR/bin:$$PATH; \
>-	$(TARGET_CONFIGURE_OPTS) $(MAKE) $(TARGET_CC) -C $(QTE_QTE_DIR) src-mt
>-	$(TARGET_CONFIGURE_OPTS) $(MAKE) $(TARGET_CC) DESTDIR=
>$(TARGET_DIR)/lib -C $(QTE_QTE_DIR) src-mt
>+	$(MAKE) $(TARGET_CONFIGURE_OPTS) $(TARGET_CC) -C $(QTE_QTE_DIR) src-mt
>+	$(MAKE) $(TARGET_CONFIGURE_OPTS) $(TARGET_CC) DESTDIR=

superfluous TARGET_CC

>$(TARGET_DIR)/lib -C $(QTE_QTE_DIR) src-mt
> 	# ... and make sure it actually built... grrr... make deep-deep-deep
>makefile recursion for this habit
> 	test -f $@
> 
> $(QTE_QTOPIA_FILE): $(QTE_QTOPIA_DIR)/.configured
> 	export QTDIR=$(QTE_QT3_DIR); export QPEDIR=$(QTE_QTOPIA_DIR); export
>PATH=$(STAGING_DIR)/bin:$$QTDIR/bin:$$PATH; \
>-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(QTE_QTOPIA_DIR)
>+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(QTE_QTOPIA_DIR)
> 
> $(QTE_QTOPIA_IFILE): $(QTE_QTOPIA_FILE)
> 	export QTDIR=$(QTE_QT3_DIR); export QPEDIR=$(QTE_QTOPIA_DIR); export
>PATH=$(STAGING_DIR)/bin:$$QTDIR/bin:$$PATH; \
>-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(QTE_QTOPIA_DIR)
>install PREFIX=$(TARGET_DIR)
>+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(QTE_QTOPIA_DIR) install PREFIX=
>$(TARGET_DIR)
> 
> 
> qte:: $(QTE_QTE_LIB)
>Index: package/tinyx/tinyx.mk
>===================================================================
>--- package/tinyx/tinyx.mk	(revision 19021)
>+++ package/tinyx/tinyx.mk	(arbetskopia)
>@@ -85,7 +85,7 @@
> 	rm -f $(TINYX_BINX)/Xfbdev
> 	#make World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=<cross compiler dir>";
> 	#( cd $(TINYX_DIR) ; $(MAKE) World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=
>$(STAGING_DIR)/bin" )
>-	#( cd $(TINYX_DIR) ; $(TARGET_CONFIGURE_OPTS) $(MAKE) World )
>+	#( cd $(TINYX_DIR) ; $(MAKE) $(TARGET_CONFIGURE_OPTS) World )

well, yea, but i don't expect that you got a real error from this hunk
;)

> 	#
> 	#mv $(TINYX_DIR)/Makefile $(TINYX_DIR)/Makefile.xxxx
> 	#echo "AS=$(TARGET_CROSS)as" > $(TINYX_DIR)/Makefile
>Index: package/samba/samba.mk
>===================================================================
>--- package/samba/samba.mk	(revision 19021)
>+++ package/samba/samba.mk	(arbetskopia)
>@@ -46,7 +46,7 @@
> 	touch $(SAMBA_DIR)/.configured
> 
> $(SAMBA_DIR)/$(SAMBA_BINARY): $(SAMBA_DIR)/.configured
>-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(SAMBA_DIR)
>+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(SAMBA_DIR)
> 
> SAMBA_TARGETS_ :=
> SAMBA_TARGETS_y :=
>@@ -79,7 +79,7 @@
> SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_WBINFO)	+= usr/bin/wbinfo
> 
> $(TARGET_DIR)/$(SAMBA_TARGET_BINARY): $(SAMBA_DIR)/$(SAMBA_BINARY)
>-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC)	\
>+	$(MAKE) $(TARGET_CONFIGURE_OPTS) 	\
> 		prefix="${TARGET_DIR}/usr" \
> 		BASEDIR="${TARGET_DIR}/usr" \
> 		SBINDIR="${TARGET_DIR}/usr/sbin" \

samba is an excellent example where (it uses autoconf) i expect all
these duplication to be superfluous; configure should have set up this
stuff properly, didn't it? (didn't look)

>--- package/libevent/libevent.mk	(revision 19021)
>+++ package/libevent/libevent.mk	(arbetskopia)
>@@ -37,7 +37,7 @@
> 	touch $@
> 
> $(LIBEVENT_DIR)/$(LIBEVENT_BINARY): $(LIBEVENT_DIR)/.configured
>-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(LIBEVENT_DIR)
>+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(LIBEVENT_DIR)
> 
> $(STAGING_DIR)/$(LIBEVENT_TARGET_BINARY):
>$(LIBEVENT_DIR)/$(LIBEVENT_BINARY)
> 	$(MAKE) -C $(LIBEVENT_DIR) DESTDIR=$(STAGING_DIR) install

I don't use this package but installing to STAGING_DIR sounds
suspicious, fwiw

>Index: package/libusb/libusb.mk
>===================================================================
>--- package/libusb/libusb.mk	(revision 19021)
>+++ package/libusb/libusb.mk	(arbetskopia)
>@@ -36,7 +36,7 @@
> 	touch $(LIBUSB_DIR)/.configured
> 
> $(STAGING_DIR)/$(LIBUSB_BINARY): $(LIBUSB_DIR)/.configured
>-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(LIBUSB_DIR)
>+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(LIBUSB_DIR)
> 	$(MAKE) -C $(LIBUSB_DIR) DESTDIR=$(STAGING_DIR) install

also suspicious DESTDIR

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [Buildroot] <package>_VER vs <package>_VERSION
  2007-07-07 21:07     ` Bernhard Fischer
@ 2007-07-07 22:19       ` Ulf Samuelsson
  0 siblings, 0 replies; 7+ messages in thread
From: Ulf Samuelsson @ 2007-07-07 22:19 UTC (permalink / raw)
  To: buildroot

>>> -----BEGIN PGP SIGNED MESSAGE-----
>>> Hash: SHA1
>>> 
>>> Ulf Samuelsson wrote:
>>> > Some packages use <package>_VER  and some use  <package>_VERSION
>>> > and some does not use this at all and hardcodes the version.
>>> > 
>>> > Suggest we clean this up so we use a single template.
>>> > 
>>> > Suggest we do it using the following template, allowing user to override.
>>> > 
>>> > ifeq    ($(<package>_VERSION),)
>>> > <package>_VERSION:=X.Y.Z
>>> > endif
>>> > 
>>> That's an interesting idea. I agree on the _VER and _VERSION clean-up. How
>>> about you submit a patch for that first? Thanks.
>>> 
>>> - -Steve
>>
>>Some packages do not have a version:
>>customize
> 
> I'd remove that one, but i guess you're opposed to that ;)

It will be OK to remove if I create <buildroot>/local !

>>gnuconfig
> 
> That's just CVS (nothing interresting was changed there, i looked about
> three weeks ago).
> 
>>hostap Always use a snapshot
>>microcom This is not clean, version = 1.02, 
>> package is m102.tar.gz
> 
> "clean", well, live with it until an upstream maintainer fixes this
> cosmetic issue.

Don't think it is maintained any longer...
We might as well "maintain" it ourself by applying the 
existing patches and put on a server somewhere
and call it 1.03 or whatever.

>>jpeg    6b vs v6b
> 
> about the same as microcom
> 

There are a number of patches for AVR32, so again
we might want to create our "own" version at some point
in the future.

>>mtd Configurable from menuconfig or snapshot

>>sfdisk No version, this is located on www.uclibc.org so we 
>> should change to sfdisk-1.00.tar.bz2
> 
> 1.00 is inappropriate. Either use the official version from util-linux
> or implement a _small_ sfdisk in busybox (but we already have fdisk,
> IIRC) or leave it alone, IMHO.
> 

We could call it 0.01 for all I care.
Have no clue what it does, but I think we should strive to
have version numbers for all supported packages.
Maybe this should just be removed from buildroot?

>>tinylogin Makefile force use of snapshot,
>> Configure using menuconfig?
> 
> standalone tinylogin is deprecated and unmaintained from my POV (use
> busybox which is actively maintained).
> 

Remove?

>>ttcp No version
> 
> "No version" depends on you view. It clearly reads
> "ttcp.c $Revision: 1.12 $";
> 

Just talking about names of files and tarballs for the buildroot Makefile.
There is no tarball for TTCP, you just download a file ttcp.c.
which does not have a version number.
I.E: it it not called ttcp-1.12.c

>>Index: package/qte/qte.mk
>>===================================================================
>>--- package/qte/qte.mk (revision 19021)
>>+++ package/qte/qte.mk (arbetskopia)
>>@@ -222,18 +222,18 @@
>> 
>> $(QTE_QTE_LIB): $(QTE_QTE_DIR)/src-mt.mk
>> export QTDIR=$(QTE_QTE_DIR); export QPEDIR=$(QTE_QTOPIA_DIR); export
>>PATH=$(STAGING_DIR)/bin:$$QTDIR/bin:$$PATH; \
>>- $(TARGET_CONFIGURE_OPTS) $(MAKE) $(TARGET_CC) -C $(QTE_QTE_DIR) src-mt
>>- $(TARGET_CONFIGURE_OPTS) $(MAKE) $(TARGET_CC) DESTDIR=
>>$(TARGET_DIR)/lib -C $(QTE_QTE_DIR) src-mt
>>+ $(MAKE) $(TARGET_CONFIGURE_OPTS) $(TARGET_CC) -C $(QTE_QTE_DIR) src-mt
>>+ $(MAKE) $(TARGET_CONFIGURE_OPTS) $(TARGET_CC) DESTDIR=
> 
> superfluous TARGET_CC
> 
>>$(TARGET_DIR)/lib -C $(QTE_QTE_DIR) src-mt
>> # ... and make sure it actually built... grrr... make deep-deep-deep
>>makefile recursion for this habit
>> test -f $@
>> 
>> $(QTE_QTOPIA_FILE): $(QTE_QTOPIA_DIR)/.configured
>> export QTDIR=$(QTE_QT3_DIR); export QPEDIR=$(QTE_QTOPIA_DIR); export
>>PATH=$(STAGING_DIR)/bin:$$QTDIR/bin:$$PATH; \
>>- $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(QTE_QTOPIA_DIR)
>>+ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(QTE_QTOPIA_DIR)
>> 
>> $(QTE_QTOPIA_IFILE): $(QTE_QTOPIA_FILE)
>> export QTDIR=$(QTE_QT3_DIR); export QPEDIR=$(QTE_QTOPIA_DIR); export
>>PATH=$(STAGING_DIR)/bin:$$QTDIR/bin:$$PATH; \
>>- $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(QTE_QTOPIA_DIR)
>>install PREFIX=$(TARGET_DIR)
>>+ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(QTE_QTOPIA_DIR) install PREFIX=
>>$(TARGET_DIR)
>> 
>> 
>> qte:: $(QTE_QTE_LIB)
>>Index: package/tinyx/tinyx.mk
>>===================================================================
>>--- package/tinyx/tinyx.mk (revision 19021)
>>+++ package/tinyx/tinyx.mk (arbetskopia)
>>@@ -85,7 +85,7 @@
>> rm -f $(TINYX_BINX)/Xfbdev
>> #make World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=<cross compiler dir>";
>> #( cd $(TINYX_DIR) ; $(MAKE) World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=
>>$(STAGING_DIR)/bin" )
>>- #( cd $(TINYX_DIR) ; $(TARGET_CONFIGURE_OPTS) $(MAKE) World )
>>+ #( cd $(TINYX_DIR) ; $(MAKE) $(TARGET_CONFIGURE_OPTS) World )
> 
> well, yea, but i don't expect that you got a real error from this hunk
> ;)

No, I am not changing this due to error I detected.
If it is wrong to use $(TARGET_CONFIGURE_OPTS) $(MAKE) for one package
then it should be wrong to use that for every other package.

Even if it does not hurt this package, someone might use a *.mk as an example
when generating support for a new package, and it would be good to remove
all bad examples, even if they are commented away like above.

> 
>> #
>> #mv $(TINYX_DIR)/Makefile $(TINYX_DIR)/Makefile.xxxx
>> #echo "AS=$(TARGET_CROSS)as" > $(TINYX_DIR)/Makefile
>>Index: package/samba/samba.mk
>>===================================================================
>>--- package/samba/samba.mk (revision 19021)
>>+++ package/samba/samba.mk (arbetskopia)
>>@@ -46,7 +46,7 @@
>> touch $(SAMBA_DIR)/.configured
>> 
>> $(SAMBA_DIR)/$(SAMBA_BINARY): $(SAMBA_DIR)/.configured
>>- $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(SAMBA_DIR)
>>+ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(SAMBA_DIR)
>> 
>> SAMBA_TARGETS_ :=
>> SAMBA_TARGETS_y :=
>>@@ -79,7 +79,7 @@
>> SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_WBINFO) += usr/bin/wbinfo
>> 
>> $(TARGET_DIR)/$(SAMBA_TARGET_BINARY): $(SAMBA_DIR)/$(SAMBA_BINARY)
>>- $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) \
>>+ $(MAKE) $(TARGET_CONFIGURE_OPTS) \
>> prefix="${TARGET_DIR}/usr" \
>> BASEDIR="${TARGET_DIR}/usr" \
>> SBINDIR="${TARGET_DIR}/usr/sbin" \
> 
> samba is an excellent example where (it uses autoconf) i expect all
> these duplication to be superfluous; configure should have set up this
> stuff properly, didn't it? (didn't look)
> 



>>--- package/libevent/libevent.mk (revision 19021)
>>+++ package/libevent/libevent.mk (arbetskopia)
>>@@ -37,7 +37,7 @@
>> touch $@
>> 
>> $(LIBEVENT_DIR)/$(LIBEVENT_BINARY): $(LIBEVENT_DIR)/.configured
>>- $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(LIBEVENT_DIR)
>>+ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(LIBEVENT_DIR)
>> 
>> $(STAGING_DIR)/$(LIBEVENT_TARGET_BINARY):
>>$(LIBEVENT_DIR)/$(LIBEVENT_BINARY)
>> $(MAKE) -C $(LIBEVENT_DIR) DESTDIR=$(STAGING_DIR) install
> 
> I don't use this package but installing to STAGING_DIR sounds
> suspicious, fwiw

I am not trying to solve all problems, maybe it is wrong, but that
is for someone else to decide.

> 
>>Index: package/libusb/libusb.mk
>>===================================================================
>>--- package/libusb/libusb.mk (revision 19021)
>>+++ package/libusb/libusb.mk (arbetskopia)
>>@@ -36,7 +36,7 @@
>> touch $(LIBUSB_DIR)/.configured
>> 
>> $(STAGING_DIR)/$(LIBUSB_BINARY): $(LIBUSB_DIR)/.configured
>>- $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(LIBUSB_DIR)
>>+ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(LIBUSB_DIR)
>> $(MAKE) -C $(LIBUSB_DIR) DESTDIR=$(STAGING_DIR) install
> 
> also suspicious DESTDIR
>


Best Regards
Ulf Samuelsson

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [Buildroot] <package>_VER vs <package>_VERSION
  2007-07-07 19:43     ` Ulf Samuelsson
@ 2007-07-08  0:42       ` Bernhard Fischer
  0 siblings, 0 replies; 7+ messages in thread
From: Bernhard Fischer @ 2007-07-08  0:42 UTC (permalink / raw)
  To: buildroot

On Sat, Jul 07, 2007 at 09:43:50PM +0200, Ulf Samuelsson wrote:

>Now with the correct attachment (zipped, to meet list limit)

ok.

^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2007-07-08  0:42 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-07 14:10 [Buildroot] <package>_VER vs <package>_VERSION Ulf Samuelsson
2007-07-07 15:49 ` Steven J. Hill
2007-07-07 19:33   ` Ulf Samuelsson
2007-07-07 19:43     ` Ulf Samuelsson
2007-07-08  0:42       ` Bernhard Fischer
2007-07-07 21:07     ` Bernhard Fischer
2007-07-07 22:19       ` Ulf Samuelsson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox