diff options
26 files changed, 572 insertions, 33 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index d087a2ab9..409278015 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -2,6 +2,22 @@ # material, please see the LICENCE file in the top-level directory. # +# Virtualization +# +$(eval $(call KMOD_template,KVM,kvm,\ + $(MODULES_DIR)/kernel/arch/${ARCH}/kvm/kvm \ +,90)) + +$(eval $(call KMOD_template,KVM_AMD,kvm-adm,\ + $(MODULES_DIR)/kernel/arch/${ARCH}/kvm/kvm-amd \ +,95)) + +$(eval $(call KMOD_template,KVM_INTEL,kvm-intel,\ + $(MODULES_DIR)/kernel/arch/${ARCH}/kvm/kvm-intel \ +,95)) + + +# # Serial ATA devices # $(eval $(call KMOD_template,SATA_AHCI,sata-ahci,\ diff --git a/mk/package.mk b/mk/package.mk index 9f40c337a..6538eb004 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -196,13 +196,13 @@ 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; \ done ifeq (,$(filter noscripts,$(7))) - cd '$${STAGING_DIR}'; grep 'usr/s*bin/' \ + @cd '$${STAGING_DIR}'; grep 'usr/s*bin/' \ '$${STAGING_PARENT}/pkg/$(1)' | \ while read fn; do \ b="$$$$(dd if="$$$$fn" bs=2 count=1 2>/dev/null)"; \ @@ -218,7 +218,7 @@ clean-targets: clean-dev-$(1) clean-dev-$(1): ifeq (,$(filter noremove,$(7))) - if test -s '$${STAGING_PARENT}/pkg/$(1)'; then \ + @if test -s '$${STAGING_PARENT}/pkg/$(1)'; then \ cd '$${STAGING_DIR}'; \ while read fn; do \ rm -f "$$$$fn"; \ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index cf4c62f95..64baf190c 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -122,7 +122,7 @@ endif done @env ${MAKE_ENV} ${MAKE} post-install $(MAKE_TRACE) ifeq (,$(filter noremove,${PKG_OPTS})) - if test -s '${STAGING_PARENT}/pkg/${PKG_NAME}'; then \ + @if test -s '${STAGING_PARENT}/pkg/${PKG_NAME}'; then \ cd '${STAGING_DIR}'; \ while read fn; do \ rm -f "$$fn"; \ @@ -207,7 +207,7 @@ clean-targets: clean-dev-generic clean-dev-generic: ifeq (,$(filter noremove,${PKG_OPTS})) - if test -s '${STAGING_PARENT}/pkg/${PKG_NAME}'; then \ + @if test -s '${STAGING_PARENT}/pkg/${PKG_NAME}'; then \ cd '${STAGING_DIR}'; \ while read fn; do \ rm -f "$$fn"; \ diff --git a/mk/vars.mk b/mk/vars.mk index b3215a24c..63130507f 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -39,9 +39,14 @@ TARGET_DIR_PFX:= $(BASE_DIR)/root_* TARGET_PATH= ${SCRIPT_DIR}:${STAGING_TOOLS}/bin:${STAGING_DIR}/scripts:${_PATH} REAL_GNU_TARGET_NAME= $(CPU_ARCH)-linux-$(ADK_TARGET_SUFFIX) GNU_TARGET_NAME= $(CPU_ARCH)-linux -TARGET_CROSS:= $(STAGING_TOOLS)/bin/$(CPU_ARCH)-linux-$(ADK_TARGET_SUFFIX)- TOOLCHAIN_SYSROOT:= $(TOOLCHAIN_BUILD_DIR)/libc_dev +ifeq ($(ADK_NATIVE),y) +TARGET_COMPILER_PREFIX?= +TARGET_CROSS:= +else TARGET_COMPILER_PREFIX?=${TARGET_CROSS} +TARGET_CROSS:= $(STAGING_TOOLS)/bin/$(CPU_ARCH)-linux-$(ADK_TARGET_SUFFIX)- +endif TARGET_CC:= ${TARGET_COMPILER_PREFIX}gcc TARGET_CXX:= ${TARGET_COMPILER_PREFIX}g++ TARGET_CPPFLAGS+= -I${STAGING_DIR}/usr/include diff --git a/package/Config.in b/package/Config.in index 43f8a4760..4a9c4ea38 100644 --- a/package/Config.in +++ b/package/Config.in @@ -376,6 +376,7 @@ source "package/m4/Config.in" source "package/make/Config.in" source "package/microperl/Config.in" source "package/php/Config.in" +source "package/python/Config.in" source "package/ruby/Config.in" source "package/libffi/Config.in" source "package/tcl/Config.in" diff --git a/package/Makefile b/package/Makefile index c4f8dcb97..c6c2d4114 100644 --- a/package/Makefile +++ b/package/Makefile @@ -321,6 +321,7 @@ package-$(ADK_PACKAGE_PRIVOXY) += privoxy package-$(ADK_PACKAGE_PROCMAIL) += procmail package-$(ADK_PACKAGE_PROCPS) += procps package-$(ADK_PACKAGE_PTUNNEL) += ptunnel +package-$(ADK_PACKAGE_PYTHON) += python package-$(ADK_PACKAGE_QUAGGA) += quagga package-$(ADK_PACKAGE_RADDUMP) += raddump package-$(ADK_PACKAGE_RADVD) += radvd diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 213895e96..52130bf10 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:= 5 +PKG_RELEASE:= 6 PKG_DESCR:= basic filesystem structure and scripts PKG_SECTION:= base diff --git a/package/base-files/extra/etc/mdev.conf b/package/base-files/extra/etc/mdev.conf index 61b818523..99c910d0b 100644 --- a/package/base-files/extra/etc/mdev.conf +++ b/package/base-files/extra/etc/mdev.conf @@ -6,6 +6,6 @@ kmem 0:0 000 mem 0:0 0640 port 0:0 0640 ptmx 0:0 666 -tty 0:0 0660 +tty 0:0 0666 ttyS* 0:0 640 .* 0:0 644 @/lib/mdev/init diff --git a/package/base-files/extra/init b/package/base-files/extra/init index 4b4e90213..9013065d0 100755 --- a/package/base-files/extra/init +++ b/package/base-files/extra/init @@ -2,10 +2,12 @@ echo "Pre-boot initializing" export PATH=/bin:/sbin:/usr/bin:/usr/sbin mount -nt proc proc /proc -size=$(awk '/MemTotal:/ { if ($2 > 16000) { print 4096 } else { print 2048 }}' /proc/meminfo) mount -o nosuid,nodev,noexec -t sysfs sysfs /sys -mount none /tmp -t tmpfs -o size=${size}k -mount none /tmp -t tmpfs -o remount,nosuid,nodev,mode=1777 +[ ! -f /etc/notmpfs ] && { + size=$(awk '/MemTotal:/ { if ($2 > 16000) { print 4096 } else { print 2048 }}' /proc/meminfo) + mount none /tmp -t tmpfs -o size=${size}k + mount none /tmp -t tmpfs -o remount,nosuid,nodev,mode=1777 +} mount -o nosuid,size=64k,mode=0755 -t tmpfs mdev /dev mkdir /dev/pts /dev/shm mount -o nosuid,noexec -t devpts devpts /dev/pts diff --git a/package/busybox/config/editors/Config.in b/package/busybox/config/editors/Config.in index ad46c649b..0d598af4c 100644 --- a/package/busybox/config/editors/Config.in +++ b/package/busybox/config/editors/Config.in @@ -22,7 +22,7 @@ config BUSYBOX_FEATURE_AWK_LIBM config BUSYBOX_CMP bool "cmp" - default n + default y help cmp is used to compare two files and returns the result to standard output. diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in index c7281edc5..d5912c6d6 100644 --- a/package/busybox/config/miscutils/Config.in +++ b/package/busybox/config/miscutils/Config.in @@ -523,7 +523,7 @@ config BUSYBOX_STRINGS config BUSYBOX_TIME bool "time" - default n + default y help The time command runs the specified program with the given arguments. When the command finishes, time writes a message to standard output diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index e4a322b18..b378722b8 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -1,8 +1,10 @@ config ADK_PACKAGE_LIBVIRT prompt "libvirt........................... virtualization API" tristate + select ADK_PACKAGE_PYTHON select ADK_PACKAGE_LIBXML2 select ADK_PACKAGE_LIBGNUTLS + select ADK_PACKAGE_BRIDGE_UTILS default n help http://www.libvirt.org diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile index dcdb0804b..f40800ded 100644 --- a/package/libvirt/Makefile +++ b/package/libvirt/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 8c2c14a7695c9c661004bcfc6468d62d PKG_DESCR:= virtualization API PKG_SECTION:= utils -PKG_DEPENDS:= libxml2 libgnutls +PKG_DEPENDS:= libxml2 libgnutls python PKG_URL:= http://www.libvirt.org PKG_SITES:= ftp://libvirt.org/libvirt/ @@ -23,11 +23,17 @@ CONFIGURE_ARGS+= --without-xen \ --without-uml \ --without-esx \ --without-openvz \ + --without-vbox \ --without-sasl BUILD_STYLE:= auto INSTALL_STYLE:= auto post-install: - ${INSTALL_DIR} ${IDIR_LIBVIRT}/usr/lib + ${INSTALL_DIR} ${IDIR_LIBVIRT}/usr/lib ${IDIR_LIBVIRT}/usr/bin + ${INSTALL_DIR} ${IDIR_LIBVIRT}/etc/libvirt ${IDIR_LIBVIRT}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/usr/bin/virsh ${IDIR_LIBVIRT}/usr/bin + ${CP} ${WRKINST}/usr/lib/libvirt.so* ${IDIR_LIBVIRT}/usr/lib + ${CP} ${WRKINST}/etc/libvirt/* ${IDIR_LIBVIRT}/etc/libvirt + ${INSTALL_BIN} ${WRKINST}/usr/sbin/libvirtd ${IDIR_LIBVIRT}/usr/sbin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/microperl/Makefile b/package/microperl/Makefile index 359357462..9e3ab4fff 100644 --- a/package/microperl/Makefile +++ b/package/microperl/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= microperl PKG_VERSION:= 5.10.0 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= d2c39b002ebfd2c3c5dba589365c5a71 PKG_DESCR:= Perl without operating-specific functions PKG_SECTION:= net @@ -31,6 +31,9 @@ pre-configure: do-install: ${INSTALL_DIR} ${IDIR_MICROPERL}/usr/bin + ${INSTALL_DIR} ${IDIR_MICROPERL}/usr/lib/perl5/${PKG_VERSION} ${INSTALL_BIN} ${WRKBUILD}/microperl ${IDIR_MICROPERL}/usr/bin/perl + ${INSTALL_DATA} ${WRKBUILD}/lib/strict.pm \ + ${IDIR_MICROPERL}/usr/lib/perl5/${PKG_VERSION} include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 559cf7565..fa93afd82 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -5,8 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openssl PKG_VERSION:= 0.9.8k -PKG_RELEASE:= 2 -CACERT_VER:= 12 +PKG_RELEASE:= 3 PKG_MD5SUM:= e555c6d58d276aec7fdc53363e338ab3 PKG_DESCR:= OpenSSL (Secure Socket Layer) libraries PKG_SECTION:= libs @@ -17,20 +16,17 @@ PKG_SITES:= http://www.openssl.org/source/ \ ftp://ftp.webmonster.de/pub/openssl/source/ \ ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ -PKG_DESCR_1:= OpenSSL (Secure Socket Layer) command line tool -PKG_SECTION_1:= admin -PKG_DEPENDS_1:= libopenssl - -PKG_DESCR_2:= X.509v3 Root CA Certificates -PKG_SECTION_2:= base +PKG_DESCR_UTIL:= OpenSSL (Secure Socket Layer) command line tool +PKG_SECTION_UTIL:= admin +PKG_DEPENDS_UTIL:= libopenssl include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION_1})) +$(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_UTIL},${PKG_DESCR_UTIL},${PKG_SECTION_UTIL})) BUILD_STYLE:= manual -INSTALL_STYLE:= auto confprog +INSTALL_STYLE:= auto INSTALL_TARGET:= install_sw FAKE_FLAGS+= INSTALL_PREFIX=${WRKINST} @@ -64,8 +60,8 @@ do-build: post-install: ${INSTALL_DIR} ${IDIR_LIBOPENSSL}/usr/lib - ${CP} ${WRKINST}/usr/lib/lib*.so.* ${IDIR_LIBOPENSSL}/usr/lib - chmod 644 ${IDIR_LIBOPENSSL}/usr/lib/lib*.so.* + ${CP} ${WRKINST}/usr/lib/lib*.so* ${IDIR_LIBOPENSSL}/usr/lib + chmod 644 ${IDIR_LIBOPENSSL}/usr/lib/lib*.so* ${INSTALL_DIR} ${IDIR_OPENSSL_UTIL}/usr/bin ${CP} ${WRKINST}/usr/bin/openssl ${IDIR_OPENSSL_UTIL}/usr/bin ${INSTALL_DIR} ${IDIR_OPENSSL_UTIL}/etc/ssl/{,certs,private} diff --git a/package/python/Config.in b/package/python/Config.in new file mode 100644 index 000000000..321f8c59c --- /dev/null +++ b/package/python/Config.in @@ -0,0 +1,6 @@ +config ADK_PACKAGE_PYTHON + prompt "python........................... Python scripting language" + tristate + default n + help + http://www.python.org diff --git a/package/python/Makefile b/package/python/Makefile new file mode 100644 index 000000000..e0df5d9e4 --- /dev/null +++ b/package/python/Makefile @@ -0,0 +1,55 @@ +# 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:= python +PKG_VERSION:= 3.1.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= f1317dbb2398374d6691edd5bff1b91d +PKG_DESCR:= Python scripting language +PKG_SECTION:= lang +PKG_URL:= http://www.python.org +PKG_SITES:= http://www.python.org/ftp/python/3.1.1/ + +DISTFILES= Python-${PKG_VERSION}.tgz +WRKDIST= ${WRKDIR}/Python-${PKG_VERSION} + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,PYTHON,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +MAKE_ENV+= OPT="$(TARGET_CFLAGS)" \ + HOSTPYTHON=./hostpython \ + HOSTPGEN=./hostpgen \ + CROSS_COMPILE=yes + +CONFIGURE_STYLE:= gnu +CONFIGURE_ENV+= OPT="$(TARGET_CFLAGS)" +CONFGIURE_ARGS:= --with-threads \ + --with-system-ffi \ + --without-cxx-main +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +pre-configure: + (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ + OPT="$(HOSTCFLAGS)" \ + ./configure --without-cxx-main --without-threads \ + --prefix=$(STAGING_TOOLS) \ + ); + $(MAKE) -C ${WRKBUILD} python Parser/pgen + (cd $(WRKBUILD);mv Parser/pgen hostpgen) + ${CP} ${WRKBUILD}/python ${WRKBUILD}/hostpython + $(MAKE) -C ${WRKBUILD} HOSTPYTHON="./hostpython" sharedmods install + $(MAKE) -C ${WRKBUILD} distclean + +post-install: + ${INSTALL_DIR} ${IDIR_PYTHON}/usr/bin ${IDIR_PYTHON}/usr/lib + ${INSTALL_DIR} ${IDIR_PYTHON}/usr/lib/python3.1 + ${INSTALL_BIN} ${WRKINST}/usr/bin/python3 ${IDIR_PYTHON}/usr/bin + ${CP} ${WRKINST}/usr/lib/libpython*.so* ${IDIR_PYTHON}/usr/lib + cd ${IDIR_PYTHON}/usr/bin && ln -s python3 python + ${CP} ${WRKINST}/usr/lib/python3.1/* ${IDIR_PYTHON}/usr/lib/python3.1 + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/python/patches/patch-Makefile_pre_in b/package/python/patches/patch-Makefile_pre_in new file mode 100644 index 000000000..bbf50fb57 --- /dev/null +++ b/package/python/patches/patch-Makefile_pre_in @@ -0,0 +1,108 @@ +--- Python-3.1.1.orig/Makefile.pre.in 2009-06-12 00:54:11.000000000 +0200 ++++ Python-3.1.1/Makefile.pre.in 2009-09-16 21:36:12.000000000 +0200 +@@ -177,6 +177,7 @@ LIBOBJS= @LIBOBJS@ + + PYTHON= python$(EXE) + BUILDPYTHON= python$(BUILDEXE) ++HOSTPYTHON?= $(BUILDPYTHON) + + # The task to run while instrument when building the profile-opt target + PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck +@@ -217,6 +218,7 @@ GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar + ########################################################################## + # Parser + PGEN= Parser/pgen$(EXE) ++HOSTPGEN?= $(PGEN)$(EXE) + + POBJS= \ + Parser/acceler.o \ +@@ -393,7 +395,7 @@ build_all_generate_profile: + $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-generate" LIBS="$(LIBS) -lgcov" + + run_profile_task: +- ./$(BUILDPYTHON) $(PROFILE_TASK) ++ $(HOSTPYTHON) $(PROFILE_TASK) + + build_all_use_profile: + $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use" +@@ -411,14 +413,14 @@ $(BUILDPYTHON): Modules/python.o $(LIBRA + $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) + + platform: $(BUILDPYTHON) +- $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform ++ $(RUNSHARED) $(HOSTPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform + + + # Build the shared modules + sharedmods: $(BUILDPYTHON) + @case $$MAKEFLAGS in \ +- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ +- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ ++ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \ ++ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(HOSTPYTHON) -E $(srcdir)/setup.py build;; \ + esac + + # Build static library +@@ -542,7 +544,7 @@ $(IO_OBJS): $(IO_H) + + $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) + -@$(INSTALL) -d Include +- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) ++ -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) + + $(PGEN): $(PGENOBJS) + $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) +@@ -705,7 +707,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/pytho + + TESTOPTS= -l $(EXTRATESTOPTS) + TESTPROG= $(srcdir)/Lib/test/regrtest.py +-TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) -E -bb ++TESTPYTHON= $(RUNSHARED) $(HOSTPYTHON) -E -bb + test: all platform + -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f + -$(TESTPYTHON) $(TESTPROG) $(TESTOPTS) +@@ -1018,7 +1020,7 @@ libainstall: all + # Install the dynamically loadable modules + # This goes into $(exec_prefix) + sharedinstall: +- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \ ++ $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \ + --prefix=$(prefix) \ + --install-scripts=$(BINDIR) \ + --install-platlib=$(DESTSHARED) \ +@@ -1056,7 +1058,7 @@ frameworkinstallstructure: $(LDLIBRARY) + fi; \ + done + $(LN) -fsn include/python$(VERSION) $(DESTDIR)$(prefix)/Headers +- sed 's/%VERSION%/'"`$(RUNSHARED) ./$(BUILDPYTHON) -c 'import platform; print(platform.python_version())'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist ++ sed 's/%VERSION%/'"`$(RUNSHARED) $(HOSTPYTHON) -c 'import platform; print(platform.python_version())'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist + $(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current + $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK) + $(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers +@@ -1098,7 +1100,7 @@ frameworkinstallextras: + # This installs a few of the useful scripts in Tools/scripts + scriptsinstall: + SRCDIR=$(srcdir) $(RUNSHARED) \ +- ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \ ++ $(HOSTPYTHON) $(srcdir)/Tools/scripts/setup.py install \ + --prefix=$(prefix) \ + --install-scripts=$(BINDIR) \ + --root=/$(DESTDIR) +@@ -1120,7 +1122,7 @@ config.status: $(srcdir)/configure + + # Run reindent on the library + reindent: +- ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib ++ $(HOSTPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib + + # Rerun configure with the same options as it was run last time, + # provided the config.status script exists +@@ -1234,7 +1236,7 @@ funny: + + # Perform some verification checks on any modified files. + patchcheck: +- $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py ++ $(RUNSHARED) $(HOSTPYTHON) $(srcdir)/Tools/scripts/patchcheck.py + + # Dependencies + diff --git a/package/python/patches/patch-Modules__io__iomodule_h b/package/python/patches/patch-Modules__io__iomodule_h new file mode 100644 index 000000000..64ac4ffaf --- /dev/null +++ b/package/python/patches/patch-Modules__io__iomodule_h @@ -0,0 +1,14 @@ +--- Python-3.1.1.orig/Modules/_io/_iomodule.h 2009-06-12 04:07:12.000000000 +0200 ++++ Python-3.1.1/Modules/_io/_iomodule.h 2009-09-16 22:02:30.000000000 +0200 +@@ -99,7 +99,10 @@ typedef off_t Py_off_t; + # define PY_OFF_T_MAX LONG_MAX + # define PY_OFF_T_MIN LONG_MIN + #else +-# error off_t does not match either size_t, long, or long long! ++# define PyLong_AsOff_t PyLong_AsSsize_t ++# define PyLong_FromOff_t PyLong_FromSsize_t ++# define PY_OFF_T_MAX PY_SSIZE_T_MAX ++# define PY_OFF_T_MIN PY_SSIZE_T_MIN + #endif + + #endif diff --git a/package/python/patches/patch-configure b/package/python/patches/patch-configure new file mode 100644 index 000000000..968288ed4 --- /dev/null +++ b/package/python/patches/patch-configure @@ -0,0 +1,324 @@ +--- Python-3.1.1.orig/configure 2009-06-08 23:22:57.000000000 +0200 ++++ Python-3.1.1/configure 2009-09-16 20:36:05.000000000 +0200 +@@ -17204,141 +17204,6 @@ fi + fi + + +-# On Tru64, chflags seems to be present, but calling it will +-# exit Python +-{ echo "$as_me:$LINENO: checking for chflags" >&5 +-echo $ECHO_N "checking for chflags... $ECHO_C" >&6; } +-if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-#include <sys/stat.h> +-#include <unistd.h> +-int main(int argc, char*argv[]) +-{ +- if(chflags(argv[0], 0) != 0) +- return 1; +- return 0; +-} +- +-_ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_CHFLAGS 1 +-_ACEOF +- +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +-else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-{ echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +- +- +- +-{ echo "$as_me:$LINENO: checking for lchflags" >&5 +-echo $ECHO_N "checking for lchflags... $ECHO_C" >&6; } +-if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-#include <sys/stat.h> +-#include <unistd.h> +-int main(int argc, char*argv[]) +-{ +- if(lchflags(argv[0], 0) != 0) +- return 1; +- return 0; +-} +- +-_ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_LCHFLAGS 1 +-_ACEOF +- +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +-else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-{ echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi + + + +@@ -22435,84 +22300,6 @@ fi + + LIBS=$LIBS_SAVE + +-# Multiprocessing check for broken sem_getvalue +-{ echo "$as_me:$LINENO: checking for broken sem_getvalue" >&5 +-echo $ECHO_N "checking for broken sem_getvalue... $ECHO_C" >&6; } +-if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-#include <unistd.h> +-#include <fcntl.h> +-#include <stdio.h> +-#include <semaphore.h> +-#include <sys/stat.h> +- +-int main(void){ +- sem_t *a = sem_open("/autoconf", O_CREAT, S_IRUSR|S_IWUSR, 0); +- int count; +- int res; +- if(a==SEM_FAILED){ +- perror("sem_open"); +- return 1; +- +- } +- res = sem_getvalue(a, &count); +- sem_close(a); +- return res==-1 ? 1 : 0; +-} +- +- +-_ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-{ echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_BROKEN_SEM_GETVALUE 1 +-_ACEOF +- +- +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi + + + +@@ -25145,94 +24932,6 @@ else + echo "${ECHO_T}no" >&6; } + fi + +-{ echo "$as_me:$LINENO: checking for %zd printf() format support" >&5 +-echo $ECHO_N "checking for %zd printf() format support... $ECHO_C" >&6; } +-if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <stdio.h> +-#include <stddef.h> +-#include <string.h> +- +-#ifdef HAVE_SYS_TYPES_H +-#include <sys/types.h> +-#endif +- +-#ifdef HAVE_SSIZE_T +-typedef ssize_t Py_ssize_t; +-#elif SIZEOF_VOID_P == SIZEOF_LONG +-typedef long Py_ssize_t; +-#else +-typedef int Py_ssize_t; +-#endif +- +-int main() +-{ +- char buffer[256]; +- +- if(sprintf(buffer, "%zd", (size_t)123) < 0) +- return 1; +- +- if (strcmp(buffer, "123")) +- return 1; +- +- if (sprintf(buffer, "%zd", (Py_ssize_t)-123) < 0) +- return 1; +- +- if (strcmp(buffer, "-123")) +- return 1; +- +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- +-cat >>confdefs.h <<\_ACEOF +-#define PY_FORMAT_SIZE_T "z" +-_ACEOF +- +-else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-{ echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi + + + diff --git a/target/native/files/etc/mdev.conf b/target/native/files/etc/mdev.conf index 82171d8ed..363d02262 100644 --- a/target/native/files/etc/mdev.conf +++ b/target/native/files/etc/mdev.conf @@ -9,6 +9,6 @@ kmem 0:0 000 mem 0:0 0640 port 0:0 0640 ptmx 0:0 666 -tty 0:0 0660 +tty 0:0 0666 ttyS* 0:0 640 .* 0:0 644 @/lib/mdev/init diff --git a/target/qemu-cris/files/etc/mdev.conf b/target/qemu-cris/files/etc/mdev.conf index 2b58560be..64ad18f62 100644 --- a/target/qemu-cris/files/etc/mdev.conf +++ b/target/qemu-cris/files/etc/mdev.conf @@ -8,6 +8,6 @@ kmem 0:9 000 mem 0:9 0640 port 0:9 0640 ptmx 0:5 666 -tty 0:5 0660 +tty 0:0 0666 ttyS* 0:20 640 .* 0:0 644 @/lib/mdev/init diff --git a/target/rescue-x86/files/etc/mdev.conf b/target/rescue-x86/files/etc/mdev.conf index 82171d8ed..363d02262 100644 --- a/target/rescue-x86/files/etc/mdev.conf +++ b/target/rescue-x86/files/etc/mdev.conf @@ -9,6 +9,6 @@ kmem 0:0 000 mem 0:0 0640 port 0:0 0640 ptmx 0:0 666 -tty 0:0 0660 +tty 0:0 0666 ttyS* 0:0 640 .* 0:0 644 @/lib/mdev/init diff --git a/target/rescue-x86_64/files/etc/mdev.conf b/target/rescue-x86_64/files/etc/mdev.conf index 82171d8ed..363d02262 100644 --- a/target/rescue-x86_64/files/etc/mdev.conf +++ b/target/rescue-x86_64/files/etc/mdev.conf @@ -9,6 +9,6 @@ kmem 0:0 000 mem 0:0 0640 port 0:0 0640 ptmx 0:0 666 -tty 0:0 0660 +tty 0:0 0666 ttyS* 0:0 640 .* 0:0 644 @/lib/mdev/init diff --git a/target/shuttle/files/etc/mdev.conf b/target/shuttle/files/etc/mdev.conf index 82171d8ed..363d02262 100644 --- a/target/shuttle/files/etc/mdev.conf +++ b/target/shuttle/files/etc/mdev.conf @@ -9,6 +9,6 @@ kmem 0:0 000 mem 0:0 0640 port 0:0 0640 ptmx 0:0 666 -tty 0:0 0660 +tty 0:0 0666 ttyS* 0:0 640 .* 0:0 644 @/lib/mdev/init diff --git a/target/shuttle/files/etc/notmpfs b/target/shuttle/files/etc/notmpfs new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/target/shuttle/files/etc/notmpfs |