Skip to content

Commit 3e69117

Browse files
danielhbdanielhb
committed
Github #9, #10 and #12 fixes
Issues #9 and #10 describe errors related to the absence of the VERSION file in the zip/tarball downloaded from Ginger webpage in Github. This happens because Github does not include in the compressed file any file that are in .gitignore. Excluding the VERSION file from .gitignore fixes both issues. Issue #12 says that the ChangeLog is missing from the zip/tarball. This was fixed before in a previous commit, but to make it available we need to retag Ginger to force Github to create a new tarball. There's also a minor issue with the previous naming used for the Ginger tags. Naming the tags as 'ginger-<version>' forces Github to create a tarball with name 'ginger-<tag>', thus the file name becomes 'ginger-ginger-<version>'. Since we need to retag the project due to these issues, the tag name will be changed to just '<version>'. To reflect that, pkg-version was changed. Signed-off-by: Daniel Henrique Barboza <[email protected]>
1 parent 9a5567a commit 3e69117

File tree

4 files changed

+64
-15
lines changed

4 files changed

+64
-15
lines changed

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
.*.swp
44
Makefile
55
Makefile.in
6-
VERSION
76
aclocal.m4
87
autom4te.cache
98
build-aux/config.guess

‎ChangeLog

+47-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
CHANGELOG
22
=========
33

4+
#### [1.3.0.1] ####
5+
* [0e1c801] Github #9, #10 and #12 fixes (Daniel Henrique Barboza)
6+
* [9a5567a] i18n.py: deleting the merge with kimchi messages (Daniel Henrique Barboza)
7+
* [a8a6514] Enhancing Power Management error messages (Daniel Henrique Barboza)
8+
* [8c5ea3a] ChangeLog file for Ginger (Daniel Henrique Barboza)
9+
* [4c81977] Make check fixes (Daniel Henrique Barboza)
10+
411
#### [ginger-1.3.0] ####
512
* [0e4806c] Debian/Ubuntu packaging files (Daniel Henrique Barboza)
613
* [23ded96] README: adding Ubuntu/Debian info. (Daniel Henrique Barboza)
@@ -39,7 +46,46 @@ CHANGELOG
3946
* [4fac9cc] Updated .gitignore to Address Generated Files ([email protected])
4047
* [5ce4a73] Adapt to new Kimchi authorization scheme (Zhou Zheng Sheng)
4148

42-
#### [ginger-1.2.1] ####
49+
#### [1.3.0.1] ####
50+
* [0e1c801] Github #9, #10 and #12 fixes (Daniel Henrique Barboza)
51+
* [9a5567a] i18n.py: deleting the merge with kimchi messages (Daniel Henrique Barboza)
52+
* [a8a6514] Enhancing Power Management error messages (Daniel Henrique Barboza)
53+
* [8c5ea3a] ChangeLog file for Ginger (Daniel Henrique Barboza)
54+
* [4c81977] Make check fixes (Daniel Henrique Barboza)
55+
* [0e4806c] Debian/Ubuntu packaging files (Daniel Henrique Barboza)
56+
* [23ded96] README: adding Ubuntu/Debian info. (Daniel Henrique Barboza)
57+
* [f0c3be7] models/ibm_sep.py: adding 'is_feature_available()' method (Daniel Henrique Barboza)
58+
* [c332517] models/interfaces.py: fixing an 'is not defined' error (Daniel Henrique Barboza)
59+
* [fd5c176] UI: Capabilities for ginger ([email protected])
60+
* [b60e80a] Capabilities API: adding support to some existing models (Daniel Henrique Barboza)
61+
* [b911174] Adding capabilities API to Makefiles (Daniel Henrique Barboza)
62+
* [6441dbf] Adding new API: Capabilities (Daniel Henrique Barboza)
63+
* [8aa841f] Fix delete user return error (Rodrigo Trujillo)
64+
* [e8453fc] Have Firmware inherit from Object ([email protected])
65+
* [b7589c6] Changing the network interfaces listing (Daniel Henrique Barboza)
66+
* [a7f2e08] UI: Ginger User Management (Wen Wang)
67+
* [b76a7e2] models/interfaces.py: removing ip/netmask on blank input ([email protected])
68+
* [1e1011f] Add Ginger Help files (Rodrigo Trujillo)
69+
* [a8bff3e] Packaging: Let Ginger Depend on Latest Kimchi (Zhou Zheng Sheng)
70+
* [3345353] Deal with bad hdd sensor data ([email protected])
71+
* [6eb90a5] Bugfix: Make buttons display properly when the text is long (Wen Wang)
72+
* [e7ed072] Enhancement: Change the SEP status style from text to a status dot (Wen Wang)
73+
* [468149e] host-admin.js: disabling OK button when processing ([email protected])
74+
* [daecbfc] Update Makefile.am to add autogen.sh in tarball. (Paulo Vital)
75+
* [3cc5181] Add timeout check for configuration backup (Zhou Zheng Sheng)
76+
* [9a3b682] Bugfix Takes time to activate tuned profile in "Power Options" (Wen Wang)
77+
* [db95b9e] IBM SEP bug fix: Update _get_subscribe info (Paulo Vital)
78+
* [eac260e] Bugfix: Change ginger's text for translation ([email protected])
79+
* [1e1905b] UI: SEP(ESA) initial setup (Wen Wang)
80+
* [b6f83bc] IBM Serviceable Event Provider (SEP): Update build files (Paulo Vital)
81+
* [c5869b6] IBM Serviceable Event Provider (SEP): Backend support (Paulo Vital)
82+
* [66db9fd] IBM Serviceable Event Provider (SEP): Update configuration files (Paulo Vital)
83+
* [646a0c1] UI: Host sensors data visualization (Wen Wang)
84+
* [ea67e95] 'tuned' troubleshot information in README file ([email protected])
85+
* [91ebfc3] Add sensors backend functionality ([email protected])
86+
* [9e5dccc] Fix pyflakes and pep 8 errors (Zhou Zheng Sheng)
87+
* [4fac9cc] Updated .gitignore to Address Generated Files ([email protected])
88+
* [5ce4a73] Adapt to new Kimchi authorization scheme (Zhou Zheng Sheng)
4389
* [77a3b53] Removed all author references from Ginger files. (Paulo Vital)
4490
* [f19cf68] Changed the year of all IBM copyright mention to 2014. (Paulo Vital)
4591
* [28450db] Change project name in all files from Kimchi-ginger to Ginger. (Paulo Vital)

‎VERSION

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.3.0.1

‎build-aux/pkg-version

+16-13
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,35 @@
1717
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1818

1919
# tags and output versions:
20-
# - ginger-1.2.0 => 1.2.0 (upstream clean)
21-
# - ginger-1.2.0-1 => 1.2.0 (downstream clean)
22-
# - ginger-1.2.0-2-g34e62f => 1.2.0 (upstream dirty)
23-
# - ginger-1.2.0-1-2-g34e62f => 1.2.0 (downstream dirty)
20+
# - 1.2.0 => 1.2.0 (upstream clean)
21+
# - 1.2.0-1 => 1.2.0 (downstream clean)
22+
# - 1.2.0-2-g34e62f => 1.2.0 (upstream dirty)
23+
# - 1.2.0-1-2-g34e62f => 1.2.0 (downstream dirty)
2424
AWK_VERSION='
2525
BEGIN { FS="-" }
26-
/^ginger-[0-9]/ {
27-
sub(/^ginger-/,"") ; print $1
26+
/^[0-9]/ {
27+
print $1
2828
}'
2929

3030
# tags and output releases:
31-
# - ginger-1.2.0 => 0 (upstream clean)
32-
# - ginger-1.2.0-1 => 1 (downstream clean)
33-
# - ginger-1.2.0-2-g34e62f1 => 2.git34e62f1 (upstream dirty)
34-
# - ginger-1.2.0-1-2-g34e62f1 => 1.2.git34e62f1 (downstream dirty)
31+
# - 1.2.0 => 0 (upstream clean)
32+
# - 1.2.0-1 => 1 (downstream clean)
33+
# - 1.2.0-2-g34e62f1 => 2.git34e62f1 (upstream dirty)
34+
# - 1.2.0-1-2-g34e62f1 => 1.2.git34e62f1 (downstream dirty)
3535
AWK_RELEASE='
3636
BEGIN { FS="-"; OFS="." }
37-
/^ginger-[0-9]/ {
38-
sub(/^ginger-/,"")
37+
/^[0-9]/ {
3938
if (NF == 1) print 0
4039
else if (NF == 2) print $2
4140
else if (NF == 3) print $2, "git" substr($3, 2)
4241
else if (NF == 4) print $2, $3, "git" substr($4, 2)
4342
}'
4443

45-
PKG_VERSION=`git describe --tags --match "ginger-[0-9]*" 2> /dev/null || cat VERSION 2> /dev/null`
44+
if [ ! -d .git ]; then
45+
PKG_VERSION=`cat VERSION`
46+
else
47+
PKG_VERSION=`git describe --tags --match "[0-9]*" || cat VERSION`
48+
fi
4649

4750
if test "x$1" = "x--full"; then
4851
echo $PKG_VERSION | tr -d '[:space:]'

0 commit comments

Comments
 (0)