diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-29 15:10:58 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-29 15:10:58 +0100 |
| commit | b1b53c029350817890301ee76c9709de49c3023f (patch) | |
| tree | f7a00571d773d9e5614df6320904fe5592c03838 | |
| parent | 265990b04ad785fecaac27f435d784b6f020b8fb (diff) | |
| parent | f4581f42e7e287aff1148da47e490830aa929ea4 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | mk/build.mk | 12 | ||||
| -rw-r--r-- | mk/host-bottom.mk | 1 |
2 files changed, 1 insertions, 12 deletions
diff --git a/mk/build.mk b/mk/build.mk index f784c99db..112d53e5b 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -18,13 +18,9 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_SIMPLE_NETWORK_CONFIG=n \ ADK_USE_CCACHE=n \ ADK_TOOLCHAIN_GDB=n \ - ADK_PACKAGE_LIBAU=n \ ADK_PACKAGE_E2FSCK_STATIC=n \ - ADK_PACKAGE_AUFS2_UTIL=n \ ADK_PACKAGE_KEXECINIT=n \ ADK_PACKAGE_INSTALLER=n \ - ADK_PACKAGE_CXXTOOLS_DEV=n \ - ADK_PACKAGE_XORG_SERVER_DEV=n \ ADK_PACKAGE_LM_SENSORS_DETECT=n \ ADK_PACKAGE_PACEMAKER=n \ ADK_PACKAGE_PACEMAKER_MGMTD=n \ @@ -37,20 +33,14 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_GRUB=n \ ADK_PACKAGE_BASE_FILES=y \ ADK_PACKAGE_CRYPTINIT=n \ - ADK_PACKAGE_HEIMDAL_SERVER=n \ - ADK_PACKAGE_LIBHEIMDAL=n \ ADK_PACKAGE_PAM=n \ - ADK_PACKAGE_PYTHON=n \ ADK_PACKAGE_VIRTINST=n \ ADK_PACKAGE_URLGRABBER=n \ ADK_PACKAGE_PERL=n \ ADK_PACKAGE_LIBSSP=n \ - ADK_PKG_DESKTOP=n \ - ADK_PKG_LAPTOP=n \ + ADK_PKG_XORG=n \ ADK_PKG_MPDBOX=n \ ADK_PKG_DEVELOPMENT=n \ - ADK_PKG_VPN_CLIENT=n \ - ADK_PKG_VPN_SERVER=n \ ADK_TOOLCHAIN_GCC_JAVA=n \ ADK_TOOLCHAIN_GCC_OBJC=n \ ADK_TOOLCHAIN_GCC_USE_SSP=n \ diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index 327883a95..dab1bd99b 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -36,7 +36,6 @@ ifneq ($(filter auto,${HOST_STYLE}),) --disable-libtool-lock \ --disable-nls \ ${HOST_CONFIGURE_ARGS} $(MAKE_TRACE) - else cd ${WRKBUILD}; rm -f config.{cache,status}; \ env ${HOST_CONFIGURE_ENV} \ |