Skip to contentSkip to conversation

Change the name of variable <PKG>_MAJOR to <PKG>_VERSION_MAJOR

PATCH New Jerzy Grzegorek 2 participants 4 messages Mar 4, 2015 – Apr 6, 2015

lore
Share & tools
lore

Jerzy Grzegorek

author
#0 lore raw

cover Change the name of variable <PKG>_MAJOR to <PKG>_VERSION_MAJOR

We usually use a name <PKG>_VERSION_MAJOR so do it for Buildroot consistency.

Jerzy Grzegorek (2):
lockdev: change the name of variable LOCKDEV_MAJOR to
LOCKDEV_VERSION_MAJOR
swig: change the name of variable SWIG_MAJOR to SWIG_VERSION_MAJOR

 package/lockdev/lockdev.mk | 8 ++++----
 package/swig/swig.mk       | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/2 lockdev: change the name of variable LOCKDEV_MAJOR to LOCKDEV_VERSION_MAJOR

Signed-off-by Jerzy Grzegorek <[email protected]>
---
 package/lockdev/lockdev.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
package/lockdev/lockdev.mk +4 -4
index 8d2c760..e40a407 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LOCKDEV_MAJOR = 1
-LOCKDEV_VERSION = $(LOCKDEV_MAJOR).0.3
+LOCKDEV_VERSION_MAJOR = 1
+LOCKDEV_VERSION = $(LOCKDEV_VERSION_MAJOR).0.3
 LOCKDEV_SOURCE = lockdev_$(LOCKDEV_VERSION).orig.tar.gz
 LOCKDEV_PATCH = lockdev_$(LOCKDEV_VERSION)-1.6.diff.gz
 LOCKDEV_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/l/lockdev

@@ -27,11 +27,11 @@ endif
 ifeq ($(BR2_SHARED_STATIC_LIBS)$(BR2_SHARED_LIBS),y)
 define LOCKDEV_CREATE_LINKS_STAGING
 	ln -sf liblockdev.$(LOCKDEV_VERSION).so $(STAGING_DIR)/usr/lib/liblockdev.so
-	ln -sf liblockdev.$(LOCKDEV_VERSION).so $(STAGING_DIR)/usr/lib/liblockdev.so.$(LOCKDEV_MAJOR)
+	ln -sf liblockdev.$(LOCKDEV_VERSION).so $(STAGING_DIR)/usr/lib/liblockdev.so.$(LOCKDEV_VERSION_MAJOR)
 endef
 
 define LOCKDEV_CREATE_LINKS_TARGET
-	ln -sf liblockdev.$(LOCKDEV_VERSION).so $(TARGET_DIR)/usr/lib/liblockdev.so.$(LOCKDEV_MAJOR)
+	ln -sf liblockdev.$(LOCKDEV_VERSION).so $(TARGET_DIR)/usr/lib/liblockdev.so.$(LOCKDEV_VERSION_MAJOR)
 endef
 endif
Signature · 1 line
1.9.1
author
#2 lore raw

PATCH 2/2 swig: change the name of variable SWIG_MAJOR to SWIG_VERSION_MAJOR

In reply to Jerzy Grzegorek
Signed-off-by Jerzy Grzegorek <[email protected]>
---
 package/swig/swig.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
package/swig/swig.mk +4 -4
index 3ef56d6..3f3ab2f 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-SWIG_MAJOR = 2.0
-SWIG_VERSION = $(SWIG_MAJOR).12
+SWIG_VERSION_MAJOR = 2.0
+SWIG_VERSION = $(SWIG_VERSION_MAJOR).12
 SWIG_SITE = http://downloads.sourceforge.net/project/swig/swig/swig-$(SWIG_VERSION)
 SWIG_DEPENDENCIES = host-bison
 HOST_SWIG_CONF_OPTS = \

@@ -25,11 +25,11 @@ SWIG_LICENSE_FILES = LICENSE LICENSE-GPL LICENSE-UNIVERSITIES
 # swig, so that our swig always gets used.
 
 define HOST_SWIG_INSTALL_SYMLINK
-	ln -fs $(HOST_DIR)/usr/bin/swig $(HOST_DIR)/usr/bin/swig$(SWIG_MAJOR)
+	ln -fs $(HOST_DIR)/usr/bin/swig $(HOST_DIR)/usr/bin/swig$(SWIG_VERSION_MAJOR)
 endef
 
 HOST_SWIG_POST_INSTALL_HOOKS += HOST_SWIG_INSTALL_SYMLINK
 
 $(eval $(host-autotools-package))
 
-SWIG = $(HOST_DIR)/usr/bin/swig$(SWIG_MAJOR)
+SWIG = $(HOST_DIR)/usr/bin/swig$(SWIG_VERSION_MAJOR)
Signature · 1 line
1.9.1
#3 lore raw

cover Change the name of variable <PKG>_MAJOR to <PKG>_VERSION_MAJOR

In reply to Jerzy Grzegorek

Dear Jerzy Grzegorek,

Quoted 10 lines · Jerzy Grzegorek

We usually use a name <PKG>_VERSION_MAJOR so do it for Buildroot consistency.

Jerzy Grzegorek (2):
lockdev: change the name of variable LOCKDEV_MAJOR to
LOCKDEV_VERSION_MAJOR
swig: change the name of variable SWIG_MAJOR to SWIG_VERSION_MAJOR

 package/lockdev/lockdev.mk | 8 ++++----
 package/swig/swig.mk       | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

Both applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com