diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-25 20:18:11 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-25 20:18:11 +0100 |
| commit | 29486d09fc74ca557f97136ac852767e48a981f2 (patch) | |
| tree | 7ea4c6a266b67fd2e87c0b8ed6d6df798b5b637b /mk | |
| parent | e473446ff8a93fb8cdc52494b4d6ee15bc15bf61 (diff) | |
| parent | 92de2ee1c2848fe50b9908bb679e0c9edcd4a867 (diff) | |
resolve merge conflict
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 1 | ||||
| -rw-r--r-- | mk/fetch.mk | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mk/build.mk b/mk/build.mk index 879bdc04b..a4ef86035 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -17,6 +17,7 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \ ADK_FORCE_PARALLEL=n \ ADK_PACKAGE_GRUB=n \ ADK_PACKAGE_GCC=n \ + ADK_PACKAGE_AUFS2_UTIL=n \ ADK_PACKAGE_BASE_FILES=y \ ADK_COMPILE_HEIMDAL=n \ ADK_PACKAGE_HEIMDAL_PKINIT=n \ diff --git a/mk/fetch.mk b/mk/fetch.mk index 5a1ba5d43..2172e9d86 100644 --- a/mk/fetch.mk +++ b/mk/fetch.mk @@ -31,7 +31,7 @@ _CHECKSUM_COOKIE?= ${WRKDIR}/.checksum_done checksum: ${_CHECKSUM_COOKIE} ifeq ($(strip ${NO_CHECKSUM}),) ${_CHECKSUM_COOKIE}: ${FULLDISTFILES} - rm -rf ${WRKDIR} + -rm -rf ${WRKDIR} @OK=n; \ (md5sum ${FULLDISTFILES}; echo exit) | while read sum name; do \ if [[ $$sum = exit ]]; then \ |