summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-11-19 09:53:00 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2009-11-19 09:53:00 +0100
commita934246178d7c686bf28c3dbed57b06120cb48d0 (patch)
treeee9df21508827ce7f2539edd7926c0c3a54d9eb0 /package
parentb5b2d187c4e25998dc560ad59c6e4aa77fb9463b (diff)
rename DEVICE to ADK_TARGET
- the name is better, because qemu f.e. is no hardware device - use make TARGET=alix1c to start with a configuration for this target - use make TARGET=alix1c allmodconfig to generate a mostly complete config to build all available packages for this platform as a package The all.config and .defconfig files needed to get this working are dynamically generated.
Diffstat (limited to 'package')
-rw-r--r--package/base-files/Makefile8
-rw-r--r--package/em28xx/Makefile5
-rw-r--r--package/exmap/Makefile2
-rw-r--r--package/heimdal/Config.in1
-rw-r--r--package/heimdal/Makefile7
-rw-r--r--package/ipset/Makefile2
-rw-r--r--package/krb5/Config.in1
-rw-r--r--package/mac80211/Makefile6
8 files changed, 17 insertions, 15 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 52130bf10..f785e303e 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
PKG_NAME:= base-files
PKG_VERSION:= 1.0
-PKG_RELEASE:= 6
+PKG_RELEASE:= 7
PKG_DESCR:= basic filesystem structure and scripts
PKG_SECTION:= base
@@ -15,7 +15,7 @@ NO_DISTFILES:= 1
ifeq ($(CPU_ARCH),x86_64)
PKG_ID= x86-64-${FS}
else
-PKG_ID= ${DEVICE}-${FS}
+PKG_ID= ${ADK_TARGET}-${FS}
endif
WRKDIR= ${WRKDIR_BASE}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}-${PKG_ID}
@@ -25,8 +25,8 @@ $(eval $(call PKG_template,BASE_FILES,base-files-${PKG_ID},${PKG_VERSION}-${PKG_
do-install:
$(CP) ./extra/* $(IDIR_BASE_FILES)
- $(CP) $(TOPDIR)/target/$(DEVICE)/files/* $(IDIR_BASE_FILES)
- $(SED) 's,@TARGET@,$(DEVICE),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
+ $(CP) $(TOPDIR)/target/$(ADK_TARGET)/files/* $(IDIR_BASE_FILES)
+ $(SED) 's,@TARGET@,$(ADK_TARGET),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
$(SED) 's,@VERSION@,$(ADK_VERSION),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
echo /bin/sh >${IDIR_BASE_FILES}/etc/shells
echo /bin/ash >>${IDIR_BASE_FILES}/etc/shells
diff --git a/package/em28xx/Makefile b/package/em28xx/Makefile
index 2a405660e..bd2ba0315 100644
--- a/package/em28xx/Makefile
+++ b/package/em28xx/Makefile
@@ -14,7 +14,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,KMOD_EM28XX,kmod-em28xx,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE})))
+$(eval $(call PKG_template,KMOD_EM28XX,kmod-em28xx,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${TARGET}-${KERNEL_RELEASE})))
CONFIGURE_STYLE:= manual
BUILD_STYLE:= manual
@@ -22,7 +22,6 @@ BUILD_STYLE:= manual
EM28XX_MAKEOPTS= -C ${WRKBUILD} \
ARCH="${ARCH}" \
CROSS_COMPILE="${TARGET_CROSS}" \
- TARGET="${HAL_TARGET}" \
TOOLPREFIX="${TARGET_CROSS}" \
TOOLPATH="${TARGET_CROSS}" \
KERNELPATH="${LINUX_DIR}" \
@@ -35,7 +34,7 @@ do-build:
post-install:
${INSTALL_DIR} ${IDIR_KMOD_EM28XX}/etc/modules.d/
${INSTALL_DIR} ${IDIR_KMOD_EM28XX}/lib/modules/${KERNEL_VERSION}/
- ${CP} ${WRKBUILD}/*.ko \
+ ${CP} ${WRKBUILD}/*.ko \
${IDIR_KMOD_EM28XX}/lib/modules/${KERNEL_VERSION}/
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/exmap/Makefile b/package/exmap/Makefile
index be7953f5b..092ba4a34 100644
--- a/package/exmap/Makefile
+++ b/package/exmap/Makefile
@@ -19,7 +19,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,EXMAP,exmap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,EXMAPD,exmapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,EXMAPSERVER,exmapserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}--${KERNEL_RELEASE},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --disable-doc
diff --git a/package/heimdal/Config.in b/package/heimdal/Config.in
index 449d4c5f3..de86f9d27 100644
--- a/package/heimdal/Config.in
+++ b/package/heimdal/Config.in
@@ -1,6 +1,7 @@
config ADK_COMPILE_HEIMDAL
prompt "heimdal........................... Heimdal kerberos software"
bool
+ depends on !ADK_COMPILE_KRB5
default n
config ADK_COMPILE_HEIMDAL_WITH_PKINIT
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile
index 3ae793bc0..d7926542b 100644
--- a/package/heimdal/Makefile
+++ b/package/heimdal/Makefile
@@ -66,11 +66,11 @@ CONFIGURE_OPTS+= --disable-pk-init
endif
TCFLAGS+= -pthread
-CONFIGURE_STYLE= gnu
+CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= ${CONFIGURE_OPTS}
CONFIGURE_ENV+= ac_cv_func_getaddrinfo_numserv=yes
-BUILD_STYLE= auto
-INSTALL_STYLE= auto confprog
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
pre-configure:
(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
@@ -93,6 +93,7 @@ pre-configure:
${MAKE} -C ${WRKBUILD} clean
post-install:
+ -rm $(STAGING_DIR)/usr/lib/libcom_err*
ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_LDAP},y)
${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/etc/openldap/schema
${INSTALL_DATA} ${WRKBUILD}/lib/hdb/hdb.schema \
diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index 4f5350201..6db433527 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -17,7 +17,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,KMOD_IPSET,kmod-ipset,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,KMOD_IPSET,kmod-ipset,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${TARGET}-${KERNEL_RELEASE},${PKG_DESCR},${PKG_SECTION}))
XAKE_FLAGS+= PREFIX=/usr
BUILD_STYLE:= auto
diff --git a/package/krb5/Config.in b/package/krb5/Config.in
index 5fa68aa6f..d4f8b6436 100644
--- a/package/krb5/Config.in
+++ b/package/krb5/Config.in
@@ -8,6 +8,7 @@ config ADK_PACKAGE_KRB5_SERVER
prompt "krb5-server....................... MIT kerberos server"
tristate
depends on ADK_COMPILE_KRB5
+ depends on !ADK_COMPILE_HEIMDAL
select ADK_PACKAGE_LIBPTHREAD
select ADK_PACKAGE_KRB5_LIBS
default n
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index d03f59486..919b7f120 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -21,9 +21,9 @@ WRKDIST= ${WRKDIR}/compat-wireless-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,KMOD_MAC80211,kmod-mac80211,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE},${PKG_DESCR},{PKG_SECTION}))
-$(eval $(call PKG_template,KMOD_MAC80211_ATH5K,kmod-mac80211-ath5k,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE},${PKG_DESCR},{PKG_SECTION}))
-$(eval $(call PKG_template,KMOD_MAC80211_RT61,kmod-mac80211-rt61,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE},${PKG_DESCR},{PKG_SECTION}))
+$(eval $(call PKG_template,KMOD_MAC80211,kmod-mac80211,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}--${KERNEL_RELEASE},${PKG_DESCR},{PKG_SECTION}))
+$(eval $(call PKG_template,KMOD_MAC80211_ATH5K,kmod-mac80211-ath5k,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}--${KERNEL_RELEASE},${PKG_DESCR},{PKG_SECTION}))
+$(eval $(call PKG_template,KMOD_MAC80211_RT61,kmod-mac80211-rt61,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}--${KERNEL_RELEASE},${PKG_DESCR},{PKG_SECTION}))
BUILD_STYLE:= auto
INSTALL_STYLE:= manual