diff options
| author | Phil Sutter <phil.sutter@viprinet.com> | 2012-01-12 19:36:21 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2012-01-15 10:15:30 +0100 |
| commit | 7f0276a57e7ea3ca9c72059d5a4836a443430d86 (patch) | |
| tree | 1096b3ea06f535afd501ecebb9a95952535c5a48 /package/ca-certificates | |
| parent | 2484dc396a420ae5a5061e4b25307ee6107bcc31 (diff) | |
ca-certificates: fix package makefile, move things around
- Additional files go best into the extra/ directory. At least not src/,
as what's inside there gets automatically installed into the package.
- Somehow the package symbol (first PKG_template param) must be the
capitalized PKG_NAME, otherwise things are b0rked.
Diffstat (limited to 'package/ca-certificates')
| -rw-r--r-- | package/ca-certificates/Makefile | 22 | ||||
| -rw-r--r-- | package/ca-certificates/extra/cert.pem (renamed from package/ca-certificates/cert.pem) | 0 | ||||
| -rw-r--r-- | package/ca-certificates/extra/update-ca-certificates (renamed from package/ca-certificates/src/update-ca-certificates) | 0 |
3 files changed, 11 insertions, 11 deletions
diff --git a/package/ca-certificates/Makefile b/package/ca-certificates/Makefile index 60716f194..228f30203 100644 --- a/package/ca-certificates/Makefile +++ b/package/ca-certificates/Makefile @@ -20,22 +20,22 @@ PKGFD_SMALL:= Minimal set of CA certificates include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,CA_CERTS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,CA_CERTIFICATES,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual post-install: -ifeq (${ADK_PACKAGE_CA_CERTS_SMALL},n) - $(INSTALL_DIR) $(IDIR_CA_CERTS)/{etc/ssl/certs,usr/share,usr/sbin} - $(CP) $(WRKINST)/usr/share/ca-certificates $(IDIR_CA_CERTS)/usr/share/ - ( cd ${IDIR_CA_CERTS}/usr/share/ca-certificates && \ - ls */*.crt >${IDIR_CA_CERTS}/etc/ca-certificates.conf \ - ) - ${INSTALL_BIN} ./extra/update-ca-certificates ${IDIR_CA_CERTS}/usr/sbin/ - -DESTDIR=${IDIR_CA_CERTS} ${BASH} ./extra/update-ca-certificates +ifeq (${ADK_PACKAGE_CA_CERTIFICATES_SMALL},y) + ${INSTALL_DIR} ${IDIR_CA_CERTIFICATES}/etc/ssl + ${INSTALL_DATA} ./extra/cert.pem ${IDIR_CA_CERTIFICATES}/etc/ssl/ else - ${INSTALL_DIR} ${IDIR_CA_CERTS}/etc/ssl - ${INSTALL_DATA} ./cert.pem ${IDIR_CA_CERTS}/etc/ssl/ + $(INSTALL_DIR) $(IDIR_CA_CERTIFICATES)/{etc/ssl/certs,usr/share,usr/sbin} + $(CP) $(WRKINST)/usr/share/ca-certificates $(IDIR_CA_CERTIFICATES)/usr/share/ + ( cd ${IDIR_CA_CERTIFICATES}/usr/share/ca-certificates && \ + ls */*.crt >${IDIR_CA_CERTIFICATES}/etc/ca-certificates.conf \ + ) + ${INSTALL_BIN} ./extra/update-ca-certificates ${IDIR_CA_CERTIFICATES}/usr/sbin/ + -DESTDIR=${IDIR_CA_CERTIFICATES} ${BASH} ./extra/update-ca-certificates endif include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/ca-certificates/cert.pem b/package/ca-certificates/extra/cert.pem index 345629503..345629503 100644 --- a/package/ca-certificates/cert.pem +++ b/package/ca-certificates/extra/cert.pem diff --git a/package/ca-certificates/src/update-ca-certificates b/package/ca-certificates/extra/update-ca-certificates index c86f7676f..c86f7676f 100644 --- a/package/ca-certificates/src/update-ca-certificates +++ b/package/ca-certificates/extra/update-ca-certificates |