From c79befcc1a0791df92460439f933843661db82e2 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 28 Aug 2009 21:35:19 +0200 Subject: add more packages needed for native builds - add bison,flex,diffutils,autoconf,automake,libtool,m4,gperf - add {glibc,eglibc,uclibc}-dev packages - add libz/libncurses development packages - add PKG_OPTS to setup special options for packages noremove is needed for uclibc/eglibc/glibc packages, otherwise needed headers will be removed slightly tested, still in development --- Makefile | 1 + mk/package.mk | 18 ++- mk/pkg-bottom.mk | 11 +- package/Config.in | 7 ++ package/Makefile | 8 ++ package/autoconf/Config.in | 6 + package/autoconf/Makefile | 28 +++++ package/automake/Config.in | 6 + package/automake/Makefile | 29 +++++ package/bison/Config.in | 6 + package/bison/Makefile | 28 +++++ package/busybox/config/archival/Config.in | 11 +- package/busybox/config/editors/Config.in | 1 + package/diffutils/Config.in | 6 + package/diffutils/Makefile | 28 +++++ package/diffutils/patches/patch-lib_regex_c | 16 +++ package/eglibc/Config.in | 8 ++ package/eglibc/Makefile | 17 ++- package/flex/Config.in | 6 + package/flex/Makefile | 27 +++++ package/gcc/Makefile | 4 +- package/git/Config.in | 1 + package/glibc/Makefile | 3 +- package/gperf/Config.in | 7 ++ package/gperf/Makefile | 27 +++++ package/libtool/Config.in | 8 ++ package/libtool/Makefile | 4 + package/m4/Config.in | 6 + package/m4/Makefile | 27 +++++ package/ncurses/Config.in | 9 ++ package/ncurses/Makefile | 5 +- package/uclibc/Config.in | 9 ++ package/uclibc/Makefile | 17 ++- package/zlib/Config.in | 10 ++ package/zlib/Makefile | 3 + scripts/create-image.sh | 8 +- target/Config.in | 44 +++++-- target/linux/config/Config.in.netdevice | 11 ++ target/qemu-mipsel/Makefile | 3 +- target/qemu-mipsel/kernel.config | 178 +++++++++++++++++++--------- 40 files changed, 558 insertions(+), 94 deletions(-) create mode 100644 package/autoconf/Config.in create mode 100644 package/autoconf/Makefile create mode 100644 package/automake/Config.in create mode 100644 package/automake/Makefile create mode 100644 package/bison/Config.in create mode 100644 package/bison/Makefile create mode 100644 package/diffutils/Config.in create mode 100644 package/diffutils/Makefile create mode 100644 package/diffutils/patches/patch-lib_regex_c create mode 100644 package/flex/Config.in create mode 100644 package/flex/Makefile create mode 100644 package/gperf/Config.in create mode 100644 package/gperf/Makefile create mode 100644 package/m4/Config.in create mode 100644 package/m4/Makefile diff --git a/Makefile b/Makefile index 8eaa1b51a..7f001e131 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ ADKVERSION= 0.1.0 export ADKVERSION +CC= gcc GMAKE?= $(PWD)/scripts/make GMAKE_FMK= ${GMAKE} -f $(PWD)/mk/build.mk GMAKE_INV= ${GMAKE_FMK} --no-print-directory diff --git a/mk/package.mk b/mk/package.mk index 1bfa33e12..318ce3d80 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -109,7 +109,11 @@ build-all-ipkgs: ${_IPKGS_COOKIE} # 4.) dependencies to other packages, $(PKG_DEPENDS) # 5.) description for the package, $(PKG_DESCR) # 6.) section of the package, $(PKG_SECTION) -# +# 7.) special package options +# noscripts -> do not install scripts to $(STAGING_DIR)/target/scripts +# (needed for example for autoconf/automake) +# noremove -> do not remove files from $(STAGING_DIR)/target while +# cleaning (needed for toolchain packages like glibc/eglibc) # should be package format independent and modular in the future define PKG_template IPKG_$(1)= $(PACKAGE_DIR)/$(2)_$(3)_${CPU_ARCH}.ipk @@ -169,12 +173,15 @@ endif done @mkdir -p $${PACKAGE_DIR} '$${STAGING_PARENT}/pkg' \ '$${STAGING_DIR}/scripts' - @if test -s '$${STAGING_PARENT}/pkg/$(1)'; then \ +ifneq ($(strip $(7)),noremove) + echo "Calling from package.mk" + if test -s '$${STAGING_PARENT}/pkg/$(1)'; then \ cd '$${STAGING_DIR}'; \ while read fn; do \ rm -f "$$$$fn"; \ done <'$${STAGING_PARENT}/pkg/$(1)'; \ fi +endif @rm -f '$${STAGING_PARENT}/pkg/$(1)' @cd $${IDIR_$(1)}; \ x=$$$$(find tmp var -mindepth 1 2>/dev/null); if [[ -n $$$$x ]]; then \ @@ -190,7 +197,7 @@ endif grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' | \ tee '$${STAGING_PARENT}/pkg/$(1)' | \ cpio -apdlmu --quiet '$${STAGING_DIR}' - @cd '$${STAGING_DIR}'; grep 'usr/lib/.*\.la$$$$' \ + cd '$${STAGING_DIR}'; grep 'usr/lib/.*\.la$$$$' \ '$${STAGING_PARENT}/pkg/$(1)' | while read fn; do \ chmod u+w $$$$fn; \ $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" $$fn; \ @@ -207,12 +214,15 @@ endif clean-targets: clean-dev-$(1) clean-dev-$(1): - @if test -s '$${STAGING_PARENT}/pkg/$(1)'; then \ +ifneq ($(strip $(7)),noremove) + echo "Calling from package.mk clean-dev" + if test -s '$${STAGING_PARENT}/pkg/$(1)'; then \ cd '$${STAGING_DIR}'; \ while read fn; do \ rm -f "$$$$fn"; \ done <'$${STAGING_PARENT}/pkg/$(1)'; \ fi +endif @rm -f '$${STAGING_PARENT}/pkg/$(1)' $$(INFO_$(1)): $$(IPKG_$(1)) diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index ccd629218..36a998a82 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -109,19 +109,19 @@ else @echo "Invalid INSTALL_STYLE '${INSTALL_STYLE}'" >&2 @exit 1 endif -#ifneq ($(filter confprog,${INSTALL_STYLE}),) @for a in ${WRKINST}/usr/{bin/*-config,lib/pkgconfig/*.pc}; do \ [[ -e $$a ]] || continue; \ $(SED) "s,^prefix=.*,prefix=${STAGING_DIR}/usr," $$a; \ done -#endif @env ${MAKE_ENV} ${MAKE} post-install $(MAKE_TRACE) - @if test -s '${STAGING_PARENT}/pkg/${PKG_NAME}'; then \ +ifneq ($(strip ${PKG_OPTS}),noremove) + if test -s '${STAGING_PARENT}/pkg/${PKG_NAME}'; then \ cd '${STAGING_DIR}'; \ while read fn; do \ rm -f "$$fn"; \ done <'${STAGING_PARENT}/pkg/${PKG_NAME}'; \ fi +endif @rm -f '${STAGING_PARENT}/pkg/${PKG_NAME}' @cd ${WRKINST}; \ if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "eglibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libthread-db" ];then \ @@ -144,6 +144,7 @@ endif echo "scripts/$$(basename "$$fn")" \ >>'${STAGING_PARENT}/pkg/${PKG_NAME}'; \ done + echo "calling from pkg-bottom.mk" touch $@ ${_IPKGS_COOKIE}: @@ -195,10 +196,12 @@ package: ${ALL_IPKGS} clean-targets: clean-dev-generic clean-dev-generic: - @if test -s '${STAGING_PARENT}/pkg/${PKG_NAME}'; then \ +ifneq ($(strip ${PKG_OPTS}),noremove) + if test -s '${STAGING_PARENT}/pkg/${PKG_NAME}'; then \ cd '${STAGING_DIR}'; \ while read fn; do \ rm -f "$$fn"; \ done <'${STAGING_PARENT}/pkg/${PKG_NAME}'; \ fi +endif @rm -f '${STAGING_PARENT}/pkg/${PKG_NAME}' diff --git a/package/Config.in b/package/Config.in index 8507fef02..8914fe1f7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -353,12 +353,19 @@ endmenu endmenu menu "Programming" +source "package/autoconf/Config.in" +source "package/automake/Config.in" source "package/binutils/Config.in" +source "package/bison/Config.in" source "package/cxxtools/Config.in" +source "package/diffutils/Config.in" +source "package/flex/Config.in" source "package/gcc/Config.in" +source "package/gperf/Config.in" source "package/haserl/Config.in" source "package/jamvm/Config.in" source "package/lua/Config.in" +source "package/m4/Config.in" source "package/make/Config.in" source "package/microperl/Config.in" source "package/php/Config.in" diff --git a/package/Makefile b/package/Makefile index 85768df9e..928074824 100644 --- a/package/Makefile +++ b/package/Makefile @@ -28,11 +28,14 @@ package-$(ADK_PACKAGE_ARPWATCH) += arpwatch package-$(ADK_PACKAGE_ASTERISK) += asterisk package-$(ADK_COMPILE_ATFTP) += atftp package-$(ADK_PACKAGE_AUFS_UTIL) += aufs2-util +package-$(ADK_PACKAGE_AUTOCONF) += autoconf +package-$(ADK_PACKAGE_AUTOMAKE) += automake package-$(ADK_PACKAGE_AUTOSSH) += autossh package-$(ADK_COMPILE_AVAHI) += avahi package-$(ADK_COMPILE_AXTLS) += axtls package-$(ADK_PACKAGE_BASH) += bash package-$(ADK_COMPILE_BC) += bc +package-$(ADK_PACKAGE_BISON) += bison package-$(ADK_PACKAGE_BZIP2) += bzip2 package-$(ADK_PACKAGE_CA_CERTS) += ca-certificates package-$(ADK_PACKAGE_CFGFS) += cfgfs @@ -67,6 +70,7 @@ package-$(ADK_PACKAGE_DBUS) += dbus package-$(ADK_PACKAGE_DECO) += deco package-$(ADK_COMPILE_DHCP) += dhcp package-$(ADK_PACKAGE_DHCP_FORWARDER) += dhcp-forwarder +package-$(ADK_PACKAGE_DIFFUTILS) += diffutils package-$(ADK_PACKAGE_DIGITEMP) += digitemp package-$(ADK_PACKAGE_DNSMASQ) += dnsmasq package-$(ADK_PACKAGE_DOSFSTOOLS) += dosfstools @@ -92,6 +96,7 @@ package-$(ADK_PACKAGE_FFMPEG) += ffmpeg package-$(ADK_PACKAGE_FILE) += file package-$(ADK_PACKAGE_FIXESPROTO) += fixesproto package-$(ADK_COMPILE_FLAC) += flac +package-$(ADK_PACKAGE_FLEX) += flex package-$(ADK_PACKAGE_FONTSPROTO) += fontsproto package-$(ADK_PACKAGE_FONTCACHEPROTO) += fontcacheproto package-$(ADK_PACKAGE_FPING) += fping @@ -123,6 +128,7 @@ endif package-$(ADK_PACKAGE_GMEDIASERVER) += gmediaserver package-$(ADK_COMPILE_GMP) += gmp package-$(ADK_COMPILE_GNUTLS) += gnutls +package-$(ADK_PACKAGE_GPERF) += gperf package-$(ADK_PACKAGE_GPG) += gpg package-$(ADK_PACKAGE_GPM) += gpm package-$(ADK_PACKAGE_GPSD) += gpsd @@ -233,6 +239,7 @@ package-$(ADK_COMPILE_LUA) += lua package-$(ADK_COMPILE_LVM) += lvm package-$(ADK_PACKAGE_MACCHANGER) += macchanger package-$(ADK_PACKAGE_MADPLAY) += madplay +package-$(ADK_PACKAGE_M4) += m4 package-$(ADK_PACKAGE_MAKE) += make package-$(ADK_PACKAGE_MARADNS) += maradns package-$(ADK_PACKAGE_MGETTY) += mgetty @@ -418,6 +425,7 @@ package-$(ADK_PACKAGE_XPROTO) += xproto package-$(ADK_PACKAGE_XORG_SERVER) += xorg-server package-$(ADK_PACKAGE_XTRANS) += xtrans package-$(ADK_PACKAGE_ZLIB) += zlib +package-$(ADK_PACKAGE_ZLIB_DEV) += zlib package-$(ADK_PACKAGE_ZSH) += zsh # kernel addon packages package-$(ADK_PACKAGE_KMOD_EM28XX) += em28xx diff --git a/package/autoconf/Config.in b/package/autoconf/Config.in new file mode 100644 index 000000000..85ce44c79 --- /dev/null +++ b/package/autoconf/Config.in @@ -0,0 +1,6 @@ +config ADK_PACKAGE_AUTOCONF + prompt "autoconf.......................... Autoconf" + tristate + default n + help + http://www.gnu.org/software/autoconf/ diff --git a/package/autoconf/Makefile b/package/autoconf/Makefile new file mode 100644 index 000000000..6e4abf3d6 --- /dev/null +++ b/package/autoconf/Makefile @@ -0,0 +1,28 @@ +# 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:= autoconf +PKG_VERSION:= 2.64 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 30a198cef839471dd4926e92ab485361 +PKG_DESCR:= GNU autoconf +PKG_SECTION:= utils +PKG_URL:= http://www.gnu.org/software/autoconf/ +PKG_SITES:= ${MASTER_SITE_GNU:=autoconf/} +PKG_OPTS:= noscripts + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,AUTOCONF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + ${INSTALL_DIR} ${IDIR_AUTOCONF}/usr/bin + ${CP} ${WRKINST}/usr/bin/auto* ${IDIR_AUTOCONF}/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/automake/Config.in b/package/automake/Config.in new file mode 100644 index 000000000..9ded7338f --- /dev/null +++ b/package/automake/Config.in @@ -0,0 +1,6 @@ +config ADK_PACKAGE_AUTOMAKE + prompt "automake.......................... Automake" + tristate + default n + help + http://www.gnu.org/software/automake/ diff --git a/package/automake/Makefile b/package/automake/Makefile new file mode 100644 index 000000000..d51bea631 --- /dev/null +++ b/package/automake/Makefile @@ -0,0 +1,29 @@ +# 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:= automake +PKG_VERSION:= 1.9.6 +PKG_RELEASE:= 1 +PKG_MD5SUM:= c60f77a42f103606981d456f1615f5b4 +PKG_DESCR:= GNU automake +PKG_SECTION:= utils +PKG_URL:= http://www.gnu.org/software/${PKG_NAME}/ +PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/} +PKG_SKIP_SCRIPTS:= 1 + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,AUTOMAKE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + ${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/automake ${IDIR_AUTOMAKE}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/aclocal ${IDIR_AUTOMAKE}/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/bison/Config.in b/package/bison/Config.in new file mode 100644 index 000000000..a78712f64 --- /dev/null +++ b/package/bison/Config.in @@ -0,0 +1,6 @@ +config ADK_PACKAGE_BISON + prompt "bison.............................. GNU parser generator" + tristate + default n + help + http://www.gnu.org/software/bison/ diff --git a/package/bison/Makefile b/package/bison/Makefile new file mode 100644 index 000000000..7c742fe6e --- /dev/null +++ b/package/bison/Makefile @@ -0,0 +1,28 @@ +# 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:= bison +PKG_VERSION:= 2.4.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= c58aa1da418dc9704070872489e89bf5 +PKG_DESCR:= GNU parser generator +PKG_SECTION:= utils +PKG_URL:= http://www.gnu.org/software/bison +PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/} + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,BISON,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + ${INSTALL_DIR} ${IDIR_BISON}/usr/bin ${IDIR_BISON}/usr/share/bison + ${INSTALL_BIN} ${WRKINST}/usr/bin/bison ${IDIR_BISON}/usr/bin + ${CP} ${WRKINST}/usr/share/bison/* ${IDIR_BISON}/usr/share/bison + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in index 0242dea05..e46fa10b0 100644 --- a/package/busybox/config/archival/Config.in +++ b/package/busybox/config/archival/Config.in @@ -7,25 +7,25 @@ menu "Archival Utilities" config BUSYBOX_FEATURE_SEAMLESS_LZMA bool "Make tar, rpm, modprobe etc understand .lzma data" - default n + default y help Make tar, rpm, modprobe etc understand .lzma data. config BUSYBOX_FEATURE_SEAMLESS_BZ2 bool "Make tar, rpm, modprobe etc understand .bz2 data" - default n + default y help Make tar, rpm, modprobe etc understand .bz2 data. config BUSYBOX_FEATURE_SEAMLESS_GZ bool "Make tar, rpm, modprobe etc understand .gz data" - default n + default y help Make tar, rpm, modprobe etc understand .gz data. config BUSYBOX_FEATURE_SEAMLESS_Z bool "Make tar and gunzip understand .Z data" - default n + default y help Make tar and gunzip understand .Z data. @@ -78,6 +78,7 @@ config BUSYBOX_BUNZIP2 config BUSYBOX_BZIP2 bool "bzip2" default n + depends on !ADK_PACKAGE_BZIP2 help bzip2 is a compression utility using the Burrows-Wheeler block sorting text compression algorithm, and Huffman coding. Compression @@ -174,6 +175,7 @@ config BUSYBOX_RPM2CPIO config BUSYBOX_RPM bool "rpm" + depends on !ADK_PACKAGE_RPM default n help Mini RPM applet - queries and extracts RPM packages. @@ -181,6 +183,7 @@ config BUSYBOX_RPM config BUSYBOX_TAR bool "tar" default y + depends on !ADK_PACKAGE_TAR help tar is an archiving program. It's commonly used with gzip to create compressed archives. It's probably the most widely used diff --git a/package/busybox/config/editors/Config.in b/package/busybox/config/editors/Config.in index cce9675df..ad46c649b 100644 --- a/package/busybox/config/editors/Config.in +++ b/package/busybox/config/editors/Config.in @@ -30,6 +30,7 @@ config BUSYBOX_CMP config BUSYBOX_DIFF bool "diff" default y + depends on !ADK_PACKAGE_DIFFUTILS help diff compares two files or directories and outputs the differences between them in a form that can be given to diff --git a/package/diffutils/Config.in b/package/diffutils/Config.in new file mode 100644 index 000000000..493c10d33 --- /dev/null +++ b/package/diffutils/Config.in @@ -0,0 +1,6 @@ +config ADK_PACKAGE_DIFFUTILS + prompt "diffutils......................... show differences between two files" + tristate + default n + help + http://www.gnu.org/software/diffutils/ diff --git a/package/diffutils/Makefile b/package/diffutils/Makefile new file mode 100644 index 000000000..70f1f53cd --- /dev/null +++ b/package/diffutils/Makefile @@ -0,0 +1,28 @@ +# 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:= diffutils +PKG_VERSION:= 2.8.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 71f9c5ae19b60608f6c7f162da86a428 +PKG_DESCR:= show differences between two files +PKG_SECTION:= comp +PKG_URL:= http://www.gnu.org/software/diffutils/ +PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/} + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,DIFFUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_ENV+= ac_use_included_regex=no +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + ${INSTALL_DIR} ${IDIR_DIFFUTILS}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/diff ${IDIR_DIFFUTILS}/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/diffutils/patches/patch-lib_regex_c b/package/diffutils/patches/patch-lib_regex_c new file mode 100644 index 000000000..c4a8bec7b --- /dev/null +++ b/package/diffutils/patches/patch-lib_regex_c @@ -0,0 +1,16 @@ +workaround for uClibc +--- diffutils-2.8.1.orig/lib/regex.c 2002-03-01 08:44:52.000000000 +0100 ++++ diffutils-2.8.1/lib/regex.c 2009-08-28 16:39:02.000000000 +0200 +@@ -8313,12 +8313,8 @@ regerror (errcode, preg, errbuf, errbuf_ + { + if (msg_size > errbuf_size) + { +-#if defined HAVE_MEMPCPY || defined _LIBC +- *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0'; +-#else + memcpy (errbuf, msg, errbuf_size - 1); + errbuf[errbuf_size - 1] = 0; +-#endif + } + else + memcpy (errbuf, msg, msg_size); diff --git a/package/eglibc/Config.in b/package/eglibc/Config.in index 80b6ad6d7..f16234bbb 100644 --- a/package/eglibc/Config.in +++ b/package/eglibc/Config.in @@ -7,3 +7,11 @@ config ADK_PACKAGE_EGLIBC help embedded GNU C library. +config ADK_PACKAGE_EGLIBC_DEV + prompt "eglibc-dev........................... development files" + bool + default n + depends on ADK_TARGET_LIB_EGLIBC + help + embedded GNU C library header files. + diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 2a228fca7..112772a7d 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -7,10 +7,12 @@ include $(TOPDIR)/toolchain/eglibc/Makefile.inc PKG_DESCR:= embedded GNU C library PKG_SECTION:= base NO_DISTFILES:= 1 +PKG_OPTS:= noremove include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,EGLIBC,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,EGLIBC,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,EGLIBC_DEV,$(PKG_NAME)-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) do-extract: @@ -27,7 +29,18 @@ endif $(CP) $(STAGING_DIR)/lib/$$file.so.* $(IDIR_EGLIBC)/lib/; \ $(CP) $(STAGING_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_EGLIBC)/lib/; \ done - # create ld.so link for x86 linker + # create ld.so link for x86 linker and gcc cd $(IDIR_EGLIBC)/lib && ln -sf ld-$(PKG_VERSION).so ld-linux.so.2 + cd $(IDIR_EGLIBC)/lib && ln -sf libc.so.6 libc.so + cd $(IDIR_EGLIBC)/lib && ln -sf libgcc_s.so.1 libgcc_s.so + # header package + ${INSTALL_DIR} $(IDIR_EGLIBC_DEV)/usr/include/{sys,bits,gnu} + for file in pthread sched wchar _G_config getopt endian features libio stdio error signal time unistd;do \ + ${CP} $(STAGING_DIR)/usr/include/$$file.h \ + $(IDIR_EGLIBC_DEV)/usr/include; \ + done + ${CP} $(STAGING_DIR)/usr/include/sys/*.h $(IDIR_EGLIBC_DEV)/usr/include/sys + ${CP} $(STAGING_DIR)/usr/include/bits/*.h $(IDIR_EGLIBC_DEV)/usr/include/bits + ${CP} $(STAGING_DIR)/usr/include/gnu/*.h $(IDIR_EGLIBC_DEV)/usr/include/gnu include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/flex/Config.in b/package/flex/Config.in new file mode 100644 index 000000000..6be8e22ea --- /dev/null +++ b/package/flex/Config.in @@ -0,0 +1,6 @@ +config ADK_PACKAGE_FLEX + prompt "flex.............................. Fast lexical analyzer" + tristate + default n + help + http://www.gnu.org/software/flex/ diff --git a/package/flex/Makefile b/package/flex/Makefile new file mode 100644 index 000000000..bb2eda080 --- /dev/null +++ b/package/flex/Makefile @@ -0,0 +1,27 @@ +# 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:= flex +PKG_VERSION:= 2.5.35 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 201d3f38758d95436cbc64903386de0b +PKG_DESCR:= fast lexical analyzer +PKG_SECTION:= utils +PKG_URL:= http://flex.sourceforge.net/ +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/} + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,FLEX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + ${INSTALL_DIR} ${IDIR_FLEX}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/flex ${IDIR_FLEX}/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gcc/Makefile b/package/gcc/Makefile index c348c9b4b..e2b0739ba 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -7,10 +7,11 @@ include ${TOPDIR}/toolchain/gcc/Makefile.inc PKG_DESCR:= GNU compiler collection PKG_SECTION:= comp PKG_DEPENDS:= mpfr +PKG_OPTS:= noremove include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GCC,gcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,GCC,gcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) TCFLAGS:= '' TCPPFLAGS:= '' @@ -46,7 +47,6 @@ ifeq ($(ADK_TARGET_LIB_UCLIBC),y) else ${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GCC}/usr/lib endif - rm ${IDIR_GCC}/usr/lib/gcc/*/*/crtendS.o rm -rf ${IDIR_GCC}/usr/lib/gcc/*/*/include-fixed rm -rf ${IDIR_GCC}/usr/lib/gcc/*/*/install-tools diff --git a/package/git/Config.in b/package/git/Config.in index 0ee3e3ea3..c897385a7 100644 --- a/package/git/Config.in +++ b/package/git/Config.in @@ -4,6 +4,7 @@ config ADK_PACKAGE_GIT select ADK_PACKAGE_LIBOPENSSL select ADK_PACKAGE_LIBCURL select ADK_PACKAGE_LIBEXPAT + select ADK_PACKAGE_LIBPTHREAD default n help Fast version control system. diff --git a/package/glibc/Makefile b/package/glibc/Makefile index f3c2bd9c7..e8ba0cd91 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -7,10 +7,11 @@ include $(TOPDIR)/toolchain/glibc/Makefile.inc PKG_DESCR:= GNU C library PKG_SECTION:= base NO_DISTFILES:= 1 +PKG_OPTS:= noremove include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,GLIBC,glibc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,GLIBC,glibc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) do-extract: diff --git a/package/gperf/Config.in b/package/gperf/Config.in new file mode 100644 index 000000000..6e5368708 --- /dev/null +++ b/package/gperf/Config.in @@ -0,0 +1,7 @@ +config ADK_PACKAGE_GPERF + prompt "gperf.............................. perfect hash function generator" + tristate + default n + select ADK_PACKAGE_LIBSTDCXX + help + http://www.gnu.org/software/gperf/ diff --git a/package/gperf/Makefile b/package/gperf/Makefile new file mode 100644 index 000000000..da90d16b8 --- /dev/null +++ b/package/gperf/Makefile @@ -0,0 +1,27 @@ +# 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:= gperf +PKG_VERSION:= 3.0.4 +PKG_RELEASE:= 1 +PKG_MD5SUM:= c1f1db32fb6598d6a93e6e88796a8632 +PKG_DESCR:= perfect hash function generator +PKG_SECTION:= comp +PKG_URL:= http://www.gnu.org/software/gperf/ +PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/} + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,GPERF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + ${INSTALL_DIR} ${IDIR_GPERF}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/gperf ${IDIR_GPERF}/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libtool/Config.in b/package/libtool/Config.in index 5d26b838b..64ac0f3e5 100644 --- a/package/libtool/Config.in +++ b/package/libtool/Config.in @@ -12,3 +12,11 @@ config ADK_PACKAGE_LIBLTDL http://www.gnu.org/software/libtool/ +config ADK_PACKAGE_LIBTOOL + prompt "libtool........................... Libtool" + tristate + default n + select ADK_COMPILE_LIBTOOL + help + http://www.gnu.org/software/libtool/ + diff --git a/package/libtool/Makefile b/package/libtool/Makefile index 40aa46663..1d5a0812f 100644 --- a/package/libtool/Makefile +++ b/package/libtool/Makefile @@ -14,6 +14,7 @@ PKG_SITES:= ${MASTER_SITE_GNU:=libtool/} include ${TOPDIR}/mk/package.mk +$(eval $(call PKG_template,LIBTOOL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBLTDL,libltdl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu @@ -23,5 +24,8 @@ INSTALL_STYLE= auto post-install: ${INSTALL_DIR} ${IDIR_LIBLTDL}/usr/lib ${CP} ${WRKINST}/usr/lib/libltdl.so.* ${IDIR_LIBLTDL}/usr/lib/ + ${INSTALL_DIR} ${IDIR_LIBTOOL}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/libtool ${IDIR_LIBTOOL}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/libtoolize ${IDIR_LIBTOOL}/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/m4/Config.in b/package/m4/Config.in new file mode 100644 index 000000000..426c772f6 --- /dev/null +++ b/package/m4/Config.in @@ -0,0 +1,6 @@ +config ADK_PACKAGE_M4 + prompt "m4.............................. macro processor" + tristate + default n + help + http://www.gnu.org/software/m4/ diff --git a/package/m4/Makefile b/package/m4/Makefile new file mode 100644 index 000000000..ea2d4538f --- /dev/null +++ b/package/m4/Makefile @@ -0,0 +1,27 @@ +# 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:= m4 +PKG_VERSION:= 1.4.13 +PKG_RELEASE:= 1 +PKG_MD5SUM:= e9e36108b5f9855a82ca4a07ebc0fd2e +PKG_DESCR:= macro processor +PKG_SECTION:= comp +PKG_URL:= http://www.gnu.org/software/m4/ +PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/} + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,M4,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + ${INSTALL_DIR} ${IDIR_M4}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/m4 ${IDIR_M4}/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/ncurses/Config.in b/package/ncurses/Config.in index e5526dbcc..63ad59b23 100644 --- a/package/ncurses/Config.in +++ b/package/ncurses/Config.in @@ -14,3 +14,12 @@ config ADK_PACKAGE_LIBNCURSES http://www.gnu.org/software/ncurses/ +config ADK_PACKAGE_LIBNCURSES_DEV + prompt "libncurses-dev.................. Ncurses development package" + tristate + default n + depends on ADK_PACKAGE_LIBNCURSES + select ADK_COMPILE_NCURSES + help + A terminal handling library + diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index 06f2ef055..c008f1917 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -15,6 +15,7 @@ PKG_SITES:= ${MASTER_SITE_GNU:=ncurses/} include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBNCURSES_DEV,libncurses-dev,${PKG_VERSION}-${PKG_RELEASE},libncurses,${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= ac_cv_linux_vers=2 @@ -58,7 +59,7 @@ post-install: # libcurses will not show up in the IPKG, only in STAGING_DIR ${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo ${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/lib - ${CP} ${WRKINST}/usr/lib/lib{form,menu,ncurses,panel}.so.* \ + ${CP} ${WRKINST}/usr/lib/lib{form,menu,ncurses,panel}.so* \ ${IDIR_LIBNCURSES}/usr/lib for f in a/ansi d/dumb l/linux r/rxvt s/screen v/vt100 v/vt102 \ v/vt220 w/wsvt25 x/xterm x/xterm-color x/xterm-xfree86; do \ @@ -67,5 +68,7 @@ post-install: ${INSTALL_DATA} ${WRKINST}/usr/share/terminfo/$$f \ ${IDIR_LIBNCURSES}/usr/share/terminfo/$$f; \ done + ${INSTALL_DIR} ${IDIR_LIBNCURSES_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBNCURSES_DEV}/usr/include include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in index 0a0776480..2df80c81d 100644 --- a/package/uclibc/Config.in +++ b/package/uclibc/Config.in @@ -7,3 +7,12 @@ config ADK_PACKAGE_UCLIBC help Embedded C library. +config ADK_PACKAGE_UCLIBC_DEV + prompt "uclibc-dev........................... development files" + bool + default n + depends on ADK_TARGET_LIB_UCLIBC + help + C library header files. + + diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile index fc02f72f5..c5d2f01a9 100644 --- a/package/uclibc/Makefile +++ b/package/uclibc/Makefile @@ -6,12 +6,13 @@ include $(TOPDIR)/toolchain/uClibc/Makefile.inc PKG_DESCR:= embedded C library PKG_SECTION:= base - -NO_DISTFILES:=1 +NO_DISTFILES:= 1 +PKG_OPTS:= noremove include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,UCLIBC,uclibc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,UCLIBC,uclibc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,UCLIBC_DEV,uclibc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) # do nothing, uClibc is already build in toolchain directory do-install: @@ -31,5 +32,15 @@ do-install: cd $(IDIR_UCLIBC)/lib && ln -sf ld-uClibc.so.0 ld.so cd $(IDIR_UCLIBC)/lib && ln -sf libc.so.0 libc.so cd $(IDIR_UCLIBC)/lib && ln -sf libgcc_s.so.1 libgcc_s.so + # header package + ${INSTALL_DIR} $(IDIR_UCLIBC_DEV)/usr/include/{sys,bits} + for file in alloca stdint locale ctype stdlib string sgidefs \ + libintl sched pthread wchar _G_config getopt endian \ + features libio stdio error signal time unistd;do \ + ${CP} $(STAGING_DIR)/usr/include/$$file.h \ + $(IDIR_UCLIBC_DEV)/usr/include; \ + done + ${CP} $(STAGING_DIR)/usr/include/sys/*.h $(IDIR_UCLIBC_DEV)/usr/include/sys + ${CP} $(STAGING_DIR)/usr/include/bits/*.h $(IDIR_UCLIBC_DEV)/usr/include/bits include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/zlib/Config.in b/package/zlib/Config.in index 5c5698815..2d4be8d8d 100644 --- a/package/zlib/Config.in +++ b/package/zlib/Config.in @@ -7,3 +7,13 @@ config ADK_PACKAGE_ZLIB http://www.zlib.net/ +config ADK_PACKAGE_ZLIB_DEV + prompt "zlib-dev........................ Zlib development files" + tristate + depends on ADK_PACKAGE_ZLIB + default n + help + A library implementing the 'deflate' compression method + http://www.zlib.net/ + + diff --git a/package/zlib/Makefile b/package/zlib/Makefile index b67959549..1428154c2 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -18,6 +18,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,ZLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,ZLIB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= manual BUILD_STYLE= auto @@ -38,5 +39,7 @@ do-configure: post-install: ${INSTALL_DIR} ${IDIR_ZLIB}/usr/lib ${CP} ${WRKBUILD}/libz.so* ${IDIR_ZLIB}/usr/lib + ${INSTALL_DIR} ${IDIR_ZLIB_DEV}/usr/include + ${CP} ${WRKBUILD}/*.h ${IDIR_ZLIB_DEV}/usr/include include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/scripts/create-image.sh b/scripts/create-image.sh index fda269990..bbebcf4d2 100755 --- a/scripts/create-image.sh +++ b/scripts/create-image.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash grubinstall=1 @@ -30,7 +30,7 @@ fi printf "Checking if grub is installed" grub=$(which grub) -if [ -x $grub ];then +if [ ! -z $grub -a -x $grub ];then printf "...okay\n" else printf "...failed\n" @@ -40,7 +40,7 @@ fi printf "Checking if parted is installed" parted=$(which parted) -if [ -x $parted ];then +if [ ! -z $parted -a -x $parted ];then printf "...okay\n" else printf "...failed\n" @@ -50,7 +50,7 @@ fi printf "Checking if qemu-img is installed" qimg=$(which qemu-img) -if [ -x $qimg ];then +if [ ! -z $qimg -a -x $qimg ];then printf "...okay\n" else printf "...failed\n" diff --git a/target/Config.in b/target/Config.in index 21a8bf13f..99fc2d19e 100644 --- a/target/Config.in +++ b/target/Config.in @@ -108,7 +108,6 @@ config ADK_LINUX_X86_ALIX1C select ADK_alix1c select ADK_KERNEL_SCSI select ADK_KERNEL_EXT2_FS - select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_PCI select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET @@ -170,6 +169,9 @@ config ADK_LINUX_RESCUE config ADK_LINUX_QEMU bool "Qemu Emulator" + select ADK_KERNEL_NET_PCI + select ADK_KERNEL_NETDEVICES + select ADK_KERNEL_NET_ETHERNET help Support for Qemu Emulator @@ -458,13 +460,13 @@ config ADK_TARGET_ROOTFS_ENCRYPTED endchoice -config ADK_SSP - bool "Enable Stack Smashing Protection" - default n - depends on ADK_LINUX_X86_ALIX1C || \ - ADK_LINUX_CRIS_FOXBOARD - help - Enable Stack Smashing Protection +#config ADK_SSP +# bool "Enable Stack Smashing Protection" +# default n +# depends on ADK_LINUX_X86_ALIX1C || \ +# ADK_LINUX_CRIS_FOXBOARD +# help +# Enable Stack Smashing Protection config ADK_CXX bool "Enable C++ support" @@ -501,14 +503,32 @@ config ADK_X11 config ADK_DEVELSYSTEM bool "Compile a OpenADK development system" default n + select ADK_CXX + select ADK_PACKAGE_AUTOCONF + select ADK_PACKAGE_AUTOMAKE select ADK_PACKAGE_BASH - select ADK_PACKAGE_MAKE - select ADK_PACKAGE_PATCH - select ADK_PACKAGE_GCC select ADK_PACKAGE_BINUTILS - select ADK_PACKAGE_TAR + select ADK_PACKAGE_BISON select ADK_PACKAGE_BZIP2 + select ADK_PACKAGE_DIFFUTILS + select ADK_PACKAGE_FILE + select ADK_PACKAGE_FLEX select ADK_PACKAGE_GAWK + select ADK_PACKAGE_GCC + select ADK_PACKAGE_GIT + select ADK_PACKAGE_GPERF + select ADK_PACKAGE_UCLIBC_DEV if ADK_TARGET_LIB_UCLIBC + select ADK_PACKAGE_EGLIBC_DEV if ADK_TARGET_LIB_EGLIBC + select ADK_PACKAGE_GLIBC_DEV if ADK_TARGET_LIB_GLIBC + select ADK_PACKAGE_LIBNCURSES + select ADK_PACKAGE_LIBNCURSES_DEV + select ADK_PACKAGE_LIBTOOL + select ADK_PACKAGE_M4 + select ADK_PACKAGE_MAKE + select ADK_PACKAGE_PATCH + select ADK_PACKAGE_TAR + select ADK_PACKAGE_ZLIB + select ADK_PACKAGE_ZLIB_DEV help After bootstrapping a Linux system you might want to switch to native builds with your target. diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index dad10f2d8..4cb091e78 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -34,6 +34,17 @@ config ADK_KPACKAGE_KMOD_NE2K_PCI help NE2000 pci driver +config ADK_KPACKAGE_KMOD_PCNET32 + prompt "kmod-net-pcnet32.............. AMD PCNet32 PCI driver" + select ADK_KERNEL_NETDEVICES + select ADK_KERNEL_NET_ETHERNET + select ADK_KERNEL_NET_PCI + select ADK_KERNEL_MII + tristate + default n + help + AMD PCnet32 driver + config ADK_KPACKAGE_KMOD_E100 prompt "kmod-net-e100................. Intel(R) PRO/100+ driver" select ADK_KERNEL_NETDEVICES diff --git a/target/qemu-mipsel/Makefile b/target/qemu-mipsel/Makefile index 0ffcfe6fe..298fcfe7d 100644 --- a/target/qemu-mipsel/Makefile +++ b/target/qemu-mipsel/Makefile @@ -16,8 +16,9 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)," @echo "Use following command to create a QEMU Image:" @echo "sudo ./scripts/create-image.sh -n qemu-mips.img $(BIN_DIR)/$(ROOTFSTARBALL)" + @echo "Be sure to change permissions after image creation." @echo "Start qemu with following options:" - @echo 'qemu-system-mipsel -nographic -M malta -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -hda qemu-mips.img -append="root=/dev/hda1 init=/init"' + @echo 'qemu-system-mipsel -nographic -M malta -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -hda qemu-mips.img -append "root=/dev/hda1"' endif ifeq ($(FS),initramfs) diff --git a/target/qemu-mipsel/kernel.config b/target/qemu-mipsel/kernel.config index 3f4026e9e..ab922e0c4 100644 --- a/target/qemu-mipsel/kernel.config +++ b/target/qemu-mipsel/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.29.4 -# Fri May 22 13:23:36 2009 +# Linux kernel version: 2.6.30.5 +# Fri Aug 28 20:38:38 2009 # CONFIG_MIPS=y @@ -57,7 +57,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_TIME=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_SCHED_OMIT_FRAME_POINTER=y -# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_BOOT_RAW=y CONFIG_CEVT_R4K_LIB=y @@ -131,6 +131,7 @@ CONFIG_32BIT=y CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_8KB is not set # CONFIG_PAGE_SIZE_16KB is not set +# CONFIG_PAGE_SIZE_32KB is not set # CONFIG_PAGE_SIZE_64KB is not set CONFIG_BOARD_SCACHE=y CONFIG_MIPS_CPU_SCACHE=y @@ -162,6 +163,8 @@ CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y # CONFIG_UNEVICTABLE_LRU is not set +CONFIG_HAVE_MLOCK=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_NO_HZ is not set # CONFIG_HIGH_RES_TIMERS is not set CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -217,6 +220,9 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_NAMESPACES is not set CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" +# CONFIG_RD_GZIP is not set +# CONFIG_RD_BZIP2 is not set +CONFIG_RD_LZMA=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y @@ -224,11 +230,12 @@ CONFIG_EMBEDDED=y CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_EXTRA_PASS is not set +# CONFIG_STRIP_ASM_SYMS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_PCSPKR_PLATFORM=y +# CONFIG_ELF_CORE is not set +# CONFIG_PCSPKR_PLATFORM is not set CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y @@ -244,7 +251,9 @@ CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set # CONFIG_PROFILING is not set +# CONFIG_MARKERS is not set CONFIG_HAVE_OPROFILE=y +# CONFIG_SLOW_WORK is not set # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y @@ -257,7 +266,6 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_BLOCK=y # CONFIG_LBD is not set -# CONFIG_BLK_DEV_IO_TRACE is not set # CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_INTEGRITY is not set @@ -285,6 +293,7 @@ CONFIG_PCI_DOMAINS=y # CONFIG_ARCH_SUPPORTS_MSI is not set # CONFIG_PCI_LEGACY is not set # CONFIG_PCI_STUB is not set +# CONFIG_PCI_IOV is not set CONFIG_MMU=y CONFIG_I8253=y # CONFIG_PCCARD is not set @@ -294,7 +303,6 @@ CONFIG_I8253=y # Executable file formats # CONFIG_BINFMT_ELF=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set # CONFIG_HAVE_AOUT is not set # CONFIG_BINFMT_MISC is not set CONFIG_TRAD_SIGNALS=y @@ -309,7 +317,6 @@ CONFIG_NET=y # # Networking options # -CONFIG_COMPAT_NET_DEV_OPS=y CONFIG_PACKET=y # CONFIG_PACKET_MMAP is not set CONFIG_UNIX=y @@ -362,6 +369,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_LAPB is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set +# CONFIG_PHONET is not set # CONFIG_NET_SCHED is not set # CONFIG_DCB is not set @@ -374,7 +382,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_AF_RXRPC is not set -# CONFIG_PHONET is not set CONFIG_FIB_RULES=y # CONFIG_WIRELESS is not set # CONFIG_WIMAX is not set @@ -417,6 +424,7 @@ CONFIG_IDE=y # # Please see Documentation/ide/ide.txt for help/info on IDE drives # +CONFIG_IDE_XFER_MODE=y # CONFIG_BLK_DEV_IDE_SATA is not set CONFIG_IDE_GD=y CONFIG_IDE_GD_ATA=y @@ -429,7 +437,7 @@ CONFIG_IDE_GD_ATA=y # # IDE chipset support/bugfixes # -CONFIG_IDE_GENERIC=y +# CONFIG_IDE_GENERIC is not set # CONFIG_BLK_DEV_PLATFORM is not set CONFIG_BLK_DEV_IDEDMA_SFF=y @@ -437,9 +445,8 @@ CONFIG_BLK_DEV_IDEDMA_SFF=y # PCI IDE chipsets support # CONFIG_BLK_DEV_IDEPCI=y -CONFIG_IDEPCI_PCIBUS_ORDER=y -# CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=y +# CONFIG_IDEPCI_PCIBUS_ORDER is not set +# CONFIG_BLK_DEV_GENERIC is not set # CONFIG_BLK_DEV_OPTI621 is not set CONFIG_BLK_DEV_IDEDMA_PCI=y # CONFIG_BLK_DEV_AEC62XX is not set @@ -471,41 +478,9 @@ CONFIG_BLK_DEV_IDEDMA=y # SCSI device support # # CONFIG_RAID_ATTRS is not set -CONFIG_SCSI=y -CONFIG_SCSI_DMA=y -# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI is not set +# CONFIG_SCSI_DMA is not set # CONFIG_SCSI_NETLINK is not set -# CONFIG_SCSI_PROC_FS is not set - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=y -# CONFIG_CHR_DEV_ST is not set -# CONFIG_CHR_DEV_OSST is not set -# CONFIG_BLK_DEV_SR is not set -# CONFIG_CHR_DEV_SG is not set -# CONFIG_CHR_DEV_SCH is not set - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# -# CONFIG_SCSI_MULTI_LUN is not set -# CONFIG_SCSI_CONSTANTS is not set -# CONFIG_SCSI_LOGGING is not set -# CONFIG_SCSI_SCAN_ASYNC is not set -CONFIG_SCSI_WAIT_SCAN=m - -# -# SCSI Transports -# -# CONFIG_SCSI_SPI_ATTRS is not set -# CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set -# CONFIG_SCSI_SAS_LIBSAS is not set -# CONFIG_SCSI_SRP_ATTRS is not set -# CONFIG_SCSI_LOWLEVEL is not set -# CONFIG_SCSI_DH is not set # CONFIG_ATA is not set # CONFIG_MD is not set # CONFIG_FUSION is not set @@ -520,7 +495,79 @@ CONFIG_SCSI_WAIT_SCAN=m # CONFIG_FIREWIRE is not set # CONFIG_IEEE1394 is not set # CONFIG_I2O is not set -# CONFIG_NETDEVICES is not set +CONFIG_NETDEVICES=y +# CONFIG_COMPAT_NET_DEV_OPS is not set +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_VETH is not set +# CONFIG_ARCNET is not set +# CONFIG_PHYLIB is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_AX88796 is not set +# CONFIG_HAPPYMEAL is not set +# CONFIG_SUNGEM is not set +# CONFIG_CASSINI is not set +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set +# CONFIG_ETHOC is not set +# CONFIG_DNET is not set +# CONFIG_NET_TULIP is not set +# CONFIG_HP100 is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +CONFIG_NET_PCI=y +CONFIG_PCNET32=y +# CONFIG_AMD8111_ETH is not set +# CONFIG_ADAPTEC_STARFIRE is not set +# CONFIG_B44 is not set +# CONFIG_FORCEDETH is not set +# CONFIG_TC35815 is not set +# CONFIG_E100 is not set +# CONFIG_FEALNX is not set +# CONFIG_NATSEMI is not set +# CONFIG_NE2K_PCI is not set +# CONFIG_8139CP is not set +# CONFIG_8139TOO is not set +# CONFIG_R6040 is not set +# CONFIG_SIS900 is not set +# CONFIG_EPIC100 is not set +# CONFIG_SMSC9420 is not set +# CONFIG_SUNDANCE is not set +# CONFIG_TLAN is not set +# CONFIG_VIA_RHINE is not set +# CONFIG_SC92031 is not set +# CONFIG_ATL2 is not set +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set +# CONFIG_TR is not set + +# +# Wireless LAN +# +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set + +# +# Enable WiMAX (Networking options) to see the WiMAX drivers +# +# CONFIG_WAN is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set # CONFIG_ISDN is not set # CONFIG_PHONE is not set @@ -703,6 +750,7 @@ CONFIG_FB=y # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set # @@ -734,7 +782,6 @@ CONFIG_HID=y # # Special HID drivers # -CONFIG_HID_COMPAT=y CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y @@ -748,7 +795,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y # # -# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may # # CONFIG_USB_GADGET is not set @@ -764,6 +811,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_RTC_LIB=y # CONFIG_RTC_CLASS is not set # CONFIG_DMADEVICES is not set +# CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set # CONFIG_STAGING is not set @@ -778,18 +826,22 @@ CONFIG_EXT2_FS=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set -CONFIG_FILE_LOCKING=y # CONFIG_XFS_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set -CONFIG_DNOTIFY=y -CONFIG_INOTIFY=y -CONFIG_INOTIFY_USER=y +CONFIG_FILE_LOCKING=y +# CONFIG_DNOTIFY is not set +# CONFIG_INOTIFY is not set # CONFIG_QUOTA is not set # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set # CONFIG_FUSE_FS is not set +# +# Caches +# +# CONFIG_FSCACHE is not set + # # CD-ROM/DVD Filesystems # @@ -833,6 +885,8 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set +# CONFIG_AUFS_FS is not set +# CONFIG_NILFS2_FS is not set CONFIG_NETWORK_FILESYSTEMS=y # CONFIG_NFS_FS is not set # CONFIG_NFSD is not set @@ -882,11 +936,21 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_DEBUG_MEMORY_INIT is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set # CONFIG_SYSCTL_SYSCALL_CHECK is not set +CONFIG_TRACING_SUPPORT=y # # Tracers # -# CONFIG_DYNAMIC_PRINTK_DEBUG is not set +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_PREEMPT_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_CONTEXT_SWITCH_TRACER is not set +# CONFIG_EVENT_TRACER is not set +# CONFIG_BOOT_TRACER is not set +# CONFIG_TRACE_BRANCH_PROFILING is not set +# CONFIG_KMEMTRACE is not set +# CONFIG_WORKQUEUE_TRACER is not set +# CONFIG_BLK_DEV_IO_TRACE is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y CONFIG_CMDLINE="console=ttyS0,115200 console=tty0" @@ -904,6 +968,7 @@ CONFIG_CMDLINE="console=ttyS0,115200 console=tty0" # OCF Configuration # # CONFIG_OCF_OCF is not set +# CONFIG_BINARY_PRINTF is not set # # Library routines @@ -917,7 +982,8 @@ CONFIG_GENERIC_FIND_LAST_BIT=y CONFIG_CRC32=y # CONFIG_CRC7 is not set # CONFIG_LIBCRC32C is not set -CONFIG_PLIST=y +CONFIG_DECOMPRESS_LZMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y +CONFIG_NLATTR=y -- cgit v1.2.3