Navigation Menu

Skip to content

Commit

Permalink
apt: suppress variable expansion
Browse files Browse the repository at this point in the history
The variable @MYSQL_VERSION@ is expanded to build host MySQL version.
It is useless for chroot build process.

The version of MySQL package installed at chroot is
really required information.

So, rewrite MYSQL_VERSION to installed MySQL package version in
build-deb.sh build process.
  • Loading branch information
kenhys committed Jan 25, 2013
1 parent b875d8c commit af918b0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion packages/apt/build-deb.sh
Expand Up @@ -123,7 +123,7 @@ cp -rp /tmp/${PACKAGE}-debian debian
# export DEB_BUILD_OPTIONS="noopt nostrip"
MYSQL_PACKAGE_INFO=\$(apt-cache show mysql-server | grep Version | sort | tail -1)
MYSQL_PACKAGE_VERSION=\${MYSQL_PACKAGE_INFO##Version: }
sed -i "s/@VERSION@/\$MYSQL_PACKAGE_VERSION/" debian/control
sed -i "s/MYSQL_VERSION/\$MYSQL_PACKAGE_VERSION/" debian/control
debuild -us -uc
EOF

Expand Down
2 changes: 1 addition & 1 deletion packages/debian/control.in
Expand Up @@ -20,7 +20,7 @@ Depends:
${misc:Depends},
${shlibs:Depends},
libgroonga0 (>= @REQUIRED_GROONGA_VERSION@),
mysql-server (= @MYSQL_VERSION@)
mysql-server (= MYSQL_VERSION)
Description: A fast fulltext searchable storage engine for MySQL.
Mroonga is a fast fulltext searchable storage engine for MySQL.
It is based on groonga, a fast fulltext search engine and column store.
Expand Down

0 comments on commit af918b0

Please sign in to comment.