summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/zlib/Makefile2
-rw-r--r--tools/adk/pkgrebuild.c34
2 files changed, 35 insertions, 1 deletions
diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index c775cad23..8360fea86 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:= be1e89810e66150f5b0327984d8625a0
PKG_DESCR:= implementation of the deflate compression method
PKG_SECTION:= libs
PKG_URL:= http://www.zlib.net/
-PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=zlib/}
+PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libpng/zlib/}
PKG_SUBPKGS:= ZLIB ZLIB_DEV
PKGSD_ZLIB_DEV:= development files for zlib
diff --git a/tools/adk/pkgrebuild.c b/tools/adk/pkgrebuild.c
index 5a8f438c1..314025582 100644
--- a/tools/adk/pkgrebuild.c
+++ b/tools/adk/pkgrebuild.c
@@ -127,6 +127,40 @@ int main() {
if (value != NULL)
pkg_name = strdup(value);
}
+ string = strstr(pbuf, "PKG_SUBPKGS:=");
+ if (string != NULL) {
+ string[strlen(string)-1] = '\0';
+ key = strtok(string, ":=");
+ value = strtok(NULL, "=\t");
+ token = strtok(value, " ");
+ while (token != NULL) {
+ keystr = malloc(256);
+ memset(keystr, 0, 256);
+ strncat(keystr, "ADK_PACKAGE_", 12);
+ strncat(keystr, token, strlen(token));
+ strmap_put(pkgmap, keystr, pkgdirp->d_name);
+ token = strtok(NULL, " ");
+ free(keystr);
+ keystr = NULL;
+ }
+ }
+ string = strstr(pbuf, "PKG_SUBPKGS+=");
+ if (string != NULL) {
+ string[strlen(string)-1] = '\0';
+ key = strtok(string, "+=");
+ value = strtok(NULL, "=\t");
+ token = strtok(value, " ");
+ while (token != NULL) {
+ keystr = malloc(256);
+ memset(keystr, 0, 256);
+ strncat(keystr, "ADK_PACKAGE_", 12);
+ strncat(keystr, token, strlen(token));
+ strmap_put(pkgmap, keystr, pkgdirp->d_name);
+ token = strtok(NULL, " ");
+ free(keystr);
+ keystr = NULL;
+ }
+ }
string = strstr(pbuf, "PKG_FLAVOURS:=");
if (string != NULL) {
string[strlen(string)-1] = '\0';