diff options
| -rw-r--r-- | mk/package.mk | 1 | ||||
| -rw-r--r-- | package/em28xx/Config.in | 9 | ||||
| -rw-r--r-- | package/em28xx/Makefile | 40 | ||||
| -rw-r--r-- | package/exmap/Makefile | 2 | ||||
| -rw-r--r-- | package/ipset/Makefile | 2 | ||||
| -rw-r--r-- | package/mac80211/Config.in | 28 | ||||
| -rw-r--r-- | package/mac80211/Makefile | 117 | ||||
| -rw-r--r-- | package/sangam-atm/Makefile | 2 | ||||
| -rw-r--r-- | package/xx | 20 |
9 files changed, 16 insertions, 205 deletions
diff --git a/mk/package.mk b/mk/package.mk index 22d60e23c..16213bf02 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -139,6 +139,7 @@ build-all-pkgs: ${_IPKGS_COOKIE} define PKG_template ALL_PKGOPTS+= $(1) PKGNAME_$(1)= $(2) +PKGDEPS_$(1)= $(4) IPKG_$(1)= $(PACKAGE_DIR)/$(2)_$(3)_${CPU_ARCH}.${PKG_SUFFIX} IDIR_$(1)= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2) ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},) diff --git a/package/em28xx/Config.in b/package/em28xx/Config.in deleted file mode 100644 index da85f5211..000000000 --- a/package/em28xx/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config ADK_PACKAGE_KMOD_EM28XX - prompt "kmod-em28xx...................... EM28xx driver" - tristate - default n - select ADK_KPACKAGE_KMOD_VIDEO_DEV - select ADK_KPACKAGE_KMOD_VIDEO_V4L1 - help - Driver for EM28xx based TV cards - diff --git a/package/em28xx/Makefile b/package/em28xx/Makefile deleted file mode 100644 index bd2ba0315..000000000 --- a/package/em28xx/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include ${TOPDIR}/rules.mk - -PKG_NAME:= em28xx -PKG_VERSION:= 20081206 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 8467a1b1d495fa712c8beb617ef5f5dd -PKG_SITES:= http://www.openadk.org/distfiles/ - -WRKDIST= ${WRKDIR}/${PKG_NAME} - -include ${TOPDIR}/mk/package.mk - - -$(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 - -EM28XX_MAKEOPTS= -C ${WRKBUILD} \ - ARCH="${ARCH}" \ - CROSS_COMPILE="${TARGET_CROSS}" \ - TOOLPREFIX="${TARGET_CROSS}" \ - TOOLPATH="${TARGET_CROSS}" \ - KERNELPATH="${LINUX_DIR}" \ - V=1 - - -do-build: - ${MAKE} ${EM28XX_MAKEOPTS} all - -post-install: - ${INSTALL_DIR} ${IDIR_KMOD_EM28XX}/etc/modules.d/ - ${INSTALL_DIR} ${IDIR_KMOD_EM28XX}/lib/modules/${KERNEL_VERSION}/ - ${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 c21e25a40..28ac936db 100644 --- a/package/exmap/Makefile +++ b/package/exmap/Makefile @@ -20,7 +20,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}-${TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}--${KERNEL_RELEASE},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-doc diff --git a/package/ipset/Makefile b/package/ipset/Makefile index 97a2b70dd..497445405 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}-${ADK_TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${ADK_TARGET}-${KERNEL_RELEASE},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,KMOD_IPSET,kmod-ipset,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION})) XAKE_FLAGS+= PREFIX=/usr BUILD_STYLE:= auto diff --git a/package/mac80211/Config.in b/package/mac80211/Config.in deleted file mode 100644 index e907531b2..000000000 --- a/package/mac80211/Config.in +++ /dev/null @@ -1,28 +0,0 @@ -config ADK_PACKAGE_KMOD_MAC80211 - prompt "kmod-mac80211................... mac80211 softmac (development)" - tristate - select ADK_MOD_KERNEL_MAC80211 - depends on !ADK_KPACKAGE_KMOD_MAC80211 - default n - help - http://linuxwireless.org/ - -config ADK_PACKAGE_KMOD_MAC80211_ATH5K - prompt "kmod-mac80211-ath5k............. Atheros 5xxx wireless driver" - tristate - depends on ADK_PACKAGE_KMOD_MAC80211 - default n - help - http://linuxwireless.org/ - -config ADK_PACKAGE_KMOD_MAC80211_RT61 - prompt "kmod-mac80211-rt61.............. Ralink rt2501/rt61 wireless driver" - tristate - default n - select ADK_KPACKAGE_KMOD_CRC_ITU_T - select ADK_PACKAGE_WIRELESS_FIRMWARE_RT61 - depends on ADK_PACKAGE_KMOD_MAC80211 - help - This adds support for rt2501 wireless chipset family. - Supported chips: RT2561, RT2561S & RT2661. - diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile deleted file mode 100644 index 919b7f120..000000000 --- a/package/mac80211/Makefile +++ /dev/null @@ -1,117 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include ${TOPDIR}/rules.mk - -PKG_NAME:= mac80211 -PKG_VERSION:= 2009-05-01 -PKG_RELEASE:= 1 -PKG_MD5SUM:= abc949ec3f7cc57302cca814d9b9c6cd -PKG_DESCR:= Linux wireless framework (SoftMAC) -PKG_SECTION:= kernel -PKG_URL:= http://wireless.kernel.org -PKG_SITES:= http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/05/ \ - http://wireless.kernel.org/download/compat-wireless-2.6/ - -PKG_DESCR_1:= ath5k driver -PKG_DESCR_2:= rt61/rt2x00 driver - -DISTFILES:= compat-wireless-${PKG_VERSION}.tar.bz2 -WRKDIST= ${WRKDIR}/compat-wireless-${PKG_VERSION} - -include ${TOPDIR}/mk/package.mk - -$(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 - -# remove entry to enable driver compilation -DISABLED_DRIVERS:= CONFIG_AR9170_USB=n \ - CONFIG_MAC80211_HWSIM=n \ - CONFIG_ATH9K=n \ - CONFIG_IWLWIFI=n \ - CONFIG_IWLAGN=n \ - CONFIG_IWL4965=n \ - CONFIG_IWL5000=n \ - CONFIG_IWL3945=n \ - CONFIG_B43=n \ - CONFIG_B43LEGACY=n \ - CONFIG_LIBIPW=n \ - CONFIG_IPW2100=n \ - CONFIG_IPW2200=n \ - CONFIG_P54_PCI=n \ - CONFIG_B44=n \ - CONFIG_RTL8180=n \ - CONFIG_ADM8211=n \ - CONFIG_RT2800PCI=n \ - CONFIG_ATMEL=n \ - CONFIG_PCI_ATMEL=n \ - CONFIG_ZD1211RW=n \ - CONFIG_P54_USB=n \ - CONFIG_RTL8187=n \ - CONFIG_AT76C50X_USB=n \ - CONFIG_RT2500USB=n \ - CONFIG_RT2800USB=n \ - CONFIG_RT2X00_LIB_USB=n \ - CONFIG_RT73USB=n \ - CONFIG_P54_COMMON=n \ - CONFIG_SSB=n \ - CONFIG_LIBERTAS_USB=n \ - CONFIG_LIBERTAS_CS=n \ - CONFIG_LIBERTAS=n \ - CONFIG_MWL8K=n \ - CONFIG_USB_NET_CDCETHER=n \ - CONFIG_USB_NET_RNDIS_HOST=n \ - CONFIG_USB_NET_RNDIS_WLAN=n - -BUILD_STYLE:= manual - -do-build: - ARCH="${ARCH}" \ - CROSS_COMPILE="${TARGET_CROSS}" \ - KLIB_BUILD="$(LINUX_DIR)" \ - KLIB="${WRKINST}/lib/modules/${KERNEL_VERSION}" \ - MODPROBE=: \ - LDFLAGS="" \ - ${DISABLED_DRIVERS} \ - V=1 \ - $(MAKE) -C ${WRKBUILD}/ - -do-install: - ${INSTALL_DIR} ${IDIR_KMOD_MAC80211}/etc/modules.d/ - ${INSTALL_DIR} ${IDIR_KMOD_MAC80211}/lib/modules/${KERNEL_VERSION}/ - ${CP} ${WRKBUILD}/net/wireless/{cfg80211,lib80211,lib80211*}.ko \ - ${IDIR_KMOD_MAC80211}/lib/modules/${KERNEL_VERSION}/ - ${CP} ${WRKBUILD}/net/mac80211/mac80211.ko \ - ${IDIR_KMOD_MAC80211}/lib/modules/${KERNEL_VERSION}/ - echo "lib80211" > ${IDIR_KMOD_MAC80211}/etc/modules.d/20-mac80211 - echo "lib80211_crypt_ccmp" >> ${IDIR_KMOD_MAC80211}/etc/modules.d/20-mac80211 - echo "cfg80211" >> ${IDIR_KMOD_MAC80211}/etc/modules.d/20-mac80211 - echo "mac80211" >> ${IDIR_KMOD_MAC80211}/etc/modules.d/20-mac80211 - # driver for ath5k - ${INSTALL_DIR} ${IDIR_KMOD_MAC80211_ATH5K}/etc/modules.d/ - ${INSTALL_DIR} ${IDIR_KMOD_MAC80211_ATH5K}/lib/modules/${KERNEL_VERSION}/ - ${CP} ${WRKBUILD}/drivers/net/wireless/ath/ath.ko \ - ${IDIR_KMOD_MAC80211_ATH5K}/lib/modules/${KERNEL_VERSION}/ - ${CP} ${WRKBUILD}/drivers/net/wireless/ath/ath5k/ath5k.ko \ - ${IDIR_KMOD_MAC80211_ATH5K}/lib/modules/${KERNEL_VERSION}/ - echo "ath" > ${IDIR_KMOD_MAC80211_ATH5K}/etc/modules.d/30-ath5k - echo "ath5k" >> ${IDIR_KMOD_MAC80211_ATH5K}/etc/modules.d/30-ath5k - # driver for rt61 - ${INSTALL_DIR} ${IDIR_KMOD_MAC80211_RT61}/etc/modules.d/ - ${INSTALL_DIR} ${IDIR_KMOD_MAC80211_RT61}/lib/modules/${KERNEL_VERSION}/ - ${CP} ${WRKBUILD}/drivers/misc/eeprom/eeprom_93cx6.ko \ - ${IDIR_KMOD_MAC80211_RT61}/lib/modules/${KERNEL_VERSION}/ - ${CP} ${WRKBUILD}/drivers/net/wireless/rt2x00/rt2x00*.ko \ - ${IDIR_KMOD_MAC80211_RT61}/lib/modules/${KERNEL_VERSION}/ - ${CP} ${WRKBUILD}/drivers/net/wireless/rt2x00/rt61pci.ko \ - ${IDIR_KMOD_MAC80211_RT61}/lib/modules/${KERNEL_VERSION}/ - echo "eeprom_93cx6" > ${IDIR_KMOD_MAC80211_RT61}/etc/modules.d/30-rt61 - echo "rt2x00lib" >> ${IDIR_KMOD_MAC80211_RT61}/etc/modules.d/30-rt61 - echo "rt2x00pci" >> ${IDIR_KMOD_MAC80211_RT61}/etc/modules.d/30-rt61 - echo "rt61pci" >> ${IDIR_KMOD_MAC80211_RT61}/etc/modules.d/30-rt61 - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/sangam-atm/Makefile b/package/sangam-atm/Makefile index e6c98e4c4..143d7a044 100644 --- a/package/sangam-atm/Makefile +++ b/package/sangam-atm/Makefile @@ -14,7 +14,7 @@ PKG_SITES:= http://openadk.org/distfiles/ include ${TOPDIR}/mk/package.mk include ${TOPDIR}/mk/kernel-vars.mk -$(eval $(call PKG_template,KMOD_SANGAM_ATM,kmod-sangam-atm,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${KERNEL_RELEASE},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,KMOD_SANGAM_ATM,kmod-sangam-atm,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/xx b/package/xx index 529a46d6f..b46ef0472 100644 --- a/package/xx +++ b/package/xx @@ -23,13 +23,17 @@ rm -f kdeps kaputt for a in */Makefile; do sd=${a%/*} cd $sd - deps=$($GMAKE show=PKG_DEPENDS) - cd .. - for dep in $deps; do - if [[ $dep = kmod-* ]]; then - print $sd $dep >>kdeps - continue - fi - [[ -e pkglist.d/$dep ]] || print $sd $dep >>kaputt + pa=$($GMAKE show=ALL_PKGOPTS) # pa: all subpackage options + for xu in $pa; do # xu: package option uppercase + x=$($GMAKE show=PKGNAME_$xu) # x: subpackage name + deps=$($GMAKE show=PKGDEPS_$xu) + for dep in $deps; do + if [[ $dep = kmod-* ]]; then + print $x $dep >>../kdeps + continue + fi + [[ -e ../pkglist.d/$dep ]] || print $x $dep >>../kaputt + done done + cd .. done |