diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/cryptinit | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/cryptinit')
| -rw-r--r-- | package/cryptinit/Config.in | 6 | ||||
| -rw-r--r-- | package/cryptinit/Makefile | 10 |
2 files changed, 6 insertions, 10 deletions
diff --git a/package/cryptinit/Config.in b/package/cryptinit/Config.in deleted file mode 100644 index f17ef17a0..000000000 --- a/package/cryptinit/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config ADK_PACKAGE_CRYPTINIT - prompt "cryptinit............................ crypt initramfs application" - tristate - default n - help - For encrypted root filesystems and fast bootup. diff --git a/package/cryptinit/Makefile b/package/cryptinit/Makefile index f186247f7..b82e67e51 100644 --- a/package/cryptinit/Makefile +++ b/package/cryptinit/Makefile @@ -6,25 +6,26 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cryptinit PKG_VERSION:= 1.0.2 PKG_RELEASE:= 1 +PKG_BUILDDEP+= cryptsetup lvm PKG_DESCR:= init for encrypted rootfilesystem PKG_SECTION:= base WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 +CFLINE_CRYPTINIT:= depends on ADK_TARGET_ROOTFS_ENCRYPTED + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CRYPTINIT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -pre-configure: - mkdir -p ${WRKBUILD} - do-build: ${TARGET_CC} ${TCPPFLAGS} ${TCFLAGS} -c -o ${WRKBUILD}/cryptinit.o \ - ./src/cryptinit.c + ${WRKBUILD}/cryptinit.c ( cd ${WRKBUILD}; \ ${TARGET_CC} -static -o cryptinit cryptinit.o \ ${STAGING_DIR}/usr/lib/libcryptsetup.a \ @@ -38,5 +39,6 @@ do-build: do-install: $(CP) ./files/initramfs_list $(LINUX_DIR) $(CP) ${WRKBUILD}/cryptinit $(LINUX_DIR) + @touch ${IDIR_CRYPTINIT}/.empty include ${TOPDIR}/mk/pkg-bottom.mk |