summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--mk/build.mk1
-rw-r--r--mk/host-bottom.mk9
-rw-r--r--package/binutils/Makefile4
-rw-r--r--package/dovecot/Makefile30
-rw-r--r--package/dovecot/patches/patch-ltmain_sh11
-rw-r--r--package/gcc/Makefile2
-rw-r--r--package/gnutls/Makefile5
-rw-r--r--package/python2/Makefile17
-rw-r--r--target/config/Config.in1
-rw-r--r--target/config/Config.in.runtime3
-rw-r--r--target/m68k/Makefile8
-rw-r--r--target/m68k/aranym.cfg.in195
-rw-r--r--target/m68k/kernel/aranym-m68k8
14 files changed, 240 insertions, 55 deletions
diff --git a/.gitignore b/.gitignore
index 55f82fdd7..b2a8d1a21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,4 @@
/target/config/Config.in.system
/target/config/Config.in.native
/target/config/Config.in.arch
+/target/m68k/aranym.cfg
diff --git a/mk/build.mk b/mk/build.mk
index 4cdccd8fd..41d482272 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -172,6 +172,7 @@ ${STAGING_TARGET_DIR} ${STAGING_TARGET_DIR}/etc ${STAGING_HOST_DIR}:
${STAGING_HOST_DIR}/{bin,lib,usr/bin,usr/lib,usr/include}
for i in lib64 lib32 libx32;do \
cd ${STAGING_TARGET_DIR}/; ln -sf lib $$i; \
+ cd ${STAGING_TARGET_DIR}/usr; ln -sf lib $$i; \
done
${STAGING_TARGET_DIR}/etc/ipkg.conf: ${STAGING_TARGET_DIR}/etc
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk
index 43a622c0f..8ef4a868e 100644
--- a/mk/host-bottom.mk
+++ b/mk/host-bottom.mk
@@ -3,6 +3,7 @@
host-extract: ${_HOST_PATCH_COOKIE}
+hostpre-configure:
host-configure:
${_HOST_CONFIGURE_COOKIE}: ${_HOST_PATCH_COOKIE}
@mkdir -p ${WRKBUILD}
@@ -25,6 +26,7 @@ endif
${CP} ${SCRIPT_DIR}/config.guess $$i; \
fi; \
done;
+ @${MAKE} hostpre-configure $(MAKE_TRACE)
ifneq (${HOST_STYLE},manual)
ifeq ($(strip ${HOST_STYLE}),)
cd ${WRKBUILD}; rm -f config.{cache,status}; \
@@ -75,8 +77,7 @@ endif
touch $@
hostpost-install:
-hpkg-install: ${ALL_HOSTINST}
-host-install:
+host-install: ${ALL_HOSTINST}
${_HOST_FAKE_COOKIE}: ${_HOST_BUILD_COOKIE}
@$(CMD_TRACE) "host installing... "
@mkdir -p ${HOST_WRKINST}
@@ -84,13 +85,13 @@ ifneq (${HOST_STYLE},manual)
ifeq ($(strip ${HOST_STYLE}),)
cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
DESTDIR='${HOST_WRKINST}' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE)
- env ${HOST_MAKE_ENV} ${MAKE} hpkg-install $(MAKE_TRACE)
+ env ${HOST_MAKE_ENV} ${MAKE} host-install $(MAKE_TRACE)
else
cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
DESTDIR='' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE)
endif
else
- env ${HOST_MAKE_ENV} ${MAKE} hpkg-install $(MAKE_TRACE)
+ env ${HOST_MAKE_ENV} ${MAKE} host-install $(MAKE_TRACE)
endif
env ${HOST_MAKE_ENV} ${MAKE} hostpost-install $(MAKE_TRACE)
@touch $@
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index 5734e198d..1a6014607 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -39,8 +39,8 @@ CONFIGURE_ARGS+= --disable-werror \
# disable honour cflags stuff
XAKE_FLAGS+= GCC_HONOUR_COPTS=s
-post-build:
- $(CP) ${WRKBUILD}/libiberty/libiberty.a $(STAGING_TARGET_DIR)/usr/lib
+pre-build:
+ @-rm $(STAGING_TARGET_DIR)/usr/lib/libiberty.a
libbfd-install:
${INSTALL_DIR} ${IDIR_LIBBFD}/usr/lib
diff --git a/package/dovecot/Makefile b/package/dovecot/Makefile
index 624d47672..0fd736e4d 100644
--- a/package/dovecot/Makefile
+++ b/package/dovecot/Makefile
@@ -4,21 +4,15 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= dovecot
-PKG_VERSION:= 2.0.5
+PKG_VERSION:= 2.2.12
PKG_RELEASE:= 1
-PKG_MD5SUM:= 7168c5bf40fdd38cceb99114547699b8
-PKG_DESCR:= A minimal and secure imap server
+PKG_MD5SUM:= 25395269fa2e0525e2d144d71d0450eb
+PKG_DESCR:= minimal and secure imap server
+PKG_BUILDDEP:= openssl
+PKG_DEPENDS:= libopenssl
PKG_SECTION:= mail
PKG_URL:= http://www.dovecot.org/
-PKG_SITES:= http://www.dovecot.org/releases/2.0/
-
-PKG_CHOICES_DOVECOT:= WITH_GNUTLS WITH_OPENSSL
-PKGCD_WITH_OPENSSL:= use OpenSSL for crypto
-PKGCS_WITH_OPENSSL:= libopenssl
-PKGCB_WITH_OPENSSL:= openssl
-PKGCD_WITH_GNUTLS:= use GnuTLS for crypto
-PKGCS_WITH_GNUTLS:= libgnutls
-PKGCB_WITH_GNUTLS:= gnutls
+PKG_SITES:= http://www.dovecot.org/releases/2.2/
include ${TOPDIR}/mk/package.mk
@@ -45,16 +39,10 @@ CONFIGURE_ARGS+= --with-notify=none \
--without-gssapi \
--without-pam \
--with-ioloop=epoll \
- --with-moduledir=/usr/lib/dovecot/modules
-
-ifeq (${ADK_PACKAGE_DOVECOT_WITH_GNUTLS},y)
-CONFIGURE_ARGS+= --with-ssl=gnutls
-endif
-ifeq (${ADK_PACKAGE_DOVECOT_WITH_OPENSSL},y)
-CONFIGURE_ARGS+= --with-ssl=openssl
-endif
+ --with-moduledir=/usr/lib/dovecot/modules \
+ --with-ssl=openssl
-post-install:
+dovecot-install:
${INSTALL_DIR} ${IDIR_DOVECOT}/etc
${INSTALL_DIR} ${IDIR_DOVECOT}/usr/sbin
${INSTALL_DIR} ${IDIR_DOVECOT}/usr/libexec/dovecot
diff --git a/package/dovecot/patches/patch-ltmain_sh b/package/dovecot/patches/patch-ltmain_sh
deleted file mode 100644
index 8c7c6bc7d..000000000
--- a/package/dovecot/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- dovecot-2.0.5.orig/ltmain.sh 2010-05-24 16:48:06.000000000 +0200
-+++ dovecot-2.0.5/ltmain.sh 2011-01-14 22:05:48.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
- func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
- func_append compile_command " $arg"
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index c0c5f749a..76e58d954 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -21,7 +21,7 @@ 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,GXX,g++,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CPPFLAGS_FOR_BUILD:= -I$(STAGING_HOST_DIR)/include
+CPPFLAGS_FOR_BUILD:= -I$(STAGING_HOST_DIR)/usr/include
CFLAGS_FOR_BUILD:=
LDFLAGS_FOR_BUILD:=
TARGET_CPPFLAGS:=
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index b160c1d5f..c75f02ea9 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= gnutls
-PKG_VERSION:= 3.2.9
+PKG_VERSION:= 3.2.12
PKG_RELEASE:= 1
-PKG_MD5SUM:= 9ae2bfa55d4c12dd6005cfb7014977f9
+PKG_MD5SUM:= f507365940de8f095e1d867c6f0842f6
PKG_DESCR:= GNU TLS library
PKG_SECTION:= crypto
PKG_DEPENDS:= libgcrypt libtasn1 zlib libnettle libgmp
@@ -45,7 +45,6 @@ ifneq ($(ADK_PACKAGE_LIBGNUTLS_WITH_CRYPTODEV),)
CONFIGURE_ARGS+= --enable-cryptodev
endif
-TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
TARGET_LDFLAGS+= -pthread
CONFIGURE_ARGS+= --disable-rpath \
--without-libz-prefix \
diff --git a/package/python2/Makefile b/package/python2/Makefile
index fe284da9d..b5aac2032 100644
--- a/package/python2/Makefile
+++ b/package/python2/Makefile
@@ -5,11 +5,12 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= python2
PKG_VERSION:= 2.7.5
-PKG_RELEASE:= 11
+PKG_RELEASE:= 12
PKG_MD5SUM:= b4f01a1d0ba0b46b05c73b2ac909b1df
PKG_DESCR:= Python scripting language (Version 2)
PKG_SECTION:= lang
-PKG_BUILDDEP:= autotool libffi bzip2-host python2-host
+PKG_BUILDDEP:= libffi python2-host
+HOST_BUILDDEP:= libffi-host bzip2-host autotool
PKG_DEPENDS:= libpthread libffi libgcc
PKG_URL:= http://www.python.org/
PKG_SITES:= http://www.python.org/ftp/python/${PKG_VERSION}/
@@ -96,18 +97,20 @@ CONFIGURE_ARGS:= --with-threads \
--without-cxx-main
HOST_STYLE:= auto
-HOST_CONFIGURE_ARGS:= --with-threads \
+HOST_CONFIGURE_ARGS+= --with-threads \
--disable-ipv6 \
--disable-shared \
--disable-toolbox-glue \
--without-cxx-main
CFLAGS_FOR_BUILD+= -fPIC
-post-extract:
+hostpre-configure:
$(CP) $(TOPDIR)/package/python2/files/patch-Lib_distutils_sysconfig_py $(WRKBUILD)
$(SED) "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py
$(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py
- (cd $(WRKBUILD) && patch -p0 <$(WRKBUILD)/patch-Lib_distutils_sysconfig_py)
+ (cd $(WRKBUILD) && patch -p0 < patch-Lib_distutils_sysconfig_py)
+ $(SED) "s#@EXENAME@#$(STAGING_HOST_DIR)/usr/bin/python#" \
+ $(WRKBUILD)/Misc/python-config.in
hostpost-install:
$(INSTALL_BIN) ${WRKBUILD}/Parser/pgen \
@@ -119,6 +122,10 @@ hostpost-install:
patch -p0 < $(WRKBUILD)/python-config.patch)
pre-configure:
+ $(CP) $(TOPDIR)/package/python2/files/patch-Lib_distutils_sysconfig_py $(WRKBUILD)
+ $(SED) "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py
+ $(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py
+ (cd $(WRKBUILD) && patch -p0 <$(WRKBUILD)/patch-Lib_distutils_sysconfig_py)
$(SED) "s#@EXENAME@#$(STAGING_HOST_DIR)/usr/bin/python#" \
$(WRKBUILD)/Misc/python-config.in
diff --git a/target/config/Config.in b/target/config/Config.in
index 05f495449..6125a2c81 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -747,7 +747,6 @@ config ADK_TARGET_ROOTFS_INITRAMFS
depends on !ADK_HARDWARE_VBOX
depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
select ADK_KERNEL_BLK_DEV_INITRD
- select ADK_KERNEL_BLK_DEV_RAM if ADK_TARGET_SYSTEM_ARANYM_M68K
help
create an read-only initramfs system.
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 721f623de..7acdd26ed 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -59,6 +59,7 @@ config ADK_RUNTIME_GETTY_VGA
default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
default y if ADK_TARGET_SYSTEM_IBM_X40
+ default y if ADK_TARGET_SYSTEM_ARANYM_M68K
default n
help
Start getty on VGA console. (tty1-tty6)
@@ -69,6 +70,7 @@ config ADK_RUNTIME_GETTY_SERIAL
default n if ADK_TARGET_SYSTEM_RASPBERRY_PI
default n if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
default n if ADK_TARGET_SYSTEM_IBM_X40
+ default n if ADK_TARGET_SYSTEM_ARANYM_M68K
default y
help
Start getty on serial console.
@@ -80,7 +82,6 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE
default "ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB || ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
default "ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB
default "ttymxc0" if ADK_TARGET_SYSTEM_CUBOX_I
- default "nfcon0" if ADK_TARGET_SYSTEM_ARANYM_M68K
default "ttyS0"
config ADK_RUNTIME_CONSOLE_SERIAL_SPEED
diff --git a/target/m68k/Makefile b/target/m68k/Makefile
index 0e7324c25..78206042c 100644
--- a/target/m68k/Makefile
+++ b/target/m68k/Makefile
@@ -26,6 +26,14 @@ imageinstall: $(FW_DIR)/$(INITRAMFS)
@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
+ifeq ($(ADK_TARGET_SYSTEM_ARANYM_M68K),y)
+ @sed -e "s#@@KERNEL@@#$(FW_DIR)/$(TARGET_KERNEL)#" \
+ -e "s#@@INITRAMFS@@#${FW_DIR}/${INITRAMFS}#" \
+ $(TOPDIR)/target/m68k/aranym.cfg.in \
+ > $(TOPDIR)/target/m68k/aranym.cfg
+ @echo 'Start aranym with: aranym-mmu -l -c target/m68k/aranym.cfg'
+ @echo 'Ungrab mouse with middle mouse click'
+endif
endif
ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
imageinstall: createinitramfs
diff --git a/target/m68k/aranym.cfg.in b/target/m68k/aranym.cfg.in
new file mode 100644
index 000000000..a2fd30170
--- /dev/null
+++ b/target/m68k/aranym.cfg.in
@@ -0,0 +1,195 @@
+[GLOBAL]
+FastRAM = 32
+Floppy =
+TOS = ROM
+EmuTOS = etos512k.img
+Bootstrap = mintara.prg
+BootstrapArgs =
+BootDrive =
+GMTime = No
+
+[STARTUP]
+GrabMouse = No
+Debugger = No
+
+[IKBD]
+WheelEiffel = No
+AltGr = Yes
+
+[HOTKEYS]
+Setup = 19:0
+Quit = 19:0x1
+Reboot = 19:0x40
+Ungrab = 27:0x141
+Debug = 19:0x100
+Screenshot = 316:0
+Fullscreen = 302:0
+
+[JIT]
+JIT = Yes
+JITFPU = Yes
+JITCacheSize = 8192
+JITLazyFlush = 1
+JITBlackList =
+JITInline = No
+
+[VIDEO]
+FullScreen = No
+BootColorDepth = -1
+VidelRefresh = 2
+VidelMonitor = -1
+SingleBlitComposing = No
+SingleBlitRefresh = No
+
+[TOS]
+Cookie_MCH = 50000
+RedirConsole = No
+
+[IDE0]
+Present = No
+IsCDROM = No
+ByteSwap = No
+ReadOnly = No
+Path =
+Cylinders = 0
+Heads = 0
+SectorsPerTrack = 0
+ModelName = Master
+
+[IDE1]
+Present = No
+IsCDROM = No
+ByteSwap = No
+ReadOnly = No
+Path =
+Cylinders = 0
+Heads = 0
+SectorsPerTrack = 0
+ModelName = Slave
+
+[PARTITION0]
+Path =
+Present = No
+PartID = BGM
+ByteSwap = No
+ReadOnly = No
+
+[HOSTFS]
+A =
+B =
+C =
+D =
+E =
+F =
+G =
+H =
+I =
+J =
+K =
+L =
+M =
+N =
+O =
+P =
+Q =
+R =
+S =
+T =
+U =
+V =
+W =
+X =
+Y =
+Z =
+
+[OPENGL]
+Enabled = No
+Filtered = No
+Library =
+
+[ETH0]
+Type = bridge
+Tunnel = tap0
+HostIP = 172.24.30.12
+AtariIP = 172.24.42.46
+Netmask = 255.255.0.0
+MAC = 00:41:45:54:48:30
+
+[LILO]
+Kernel = @@KERNEL@@
+Args = console=tty debug=par
+Ramdisk = @@INITRAMFS@@
+
+[MIDI]
+Type = none
+File =
+Sequencer = /dev/sequencer
+
+[CDROMS]
+A = -1
+B = -1
+C = -1
+D = -1
+E = -1
+F = -1
+G = -1
+H = -1
+I = -1
+J = -1
+K = -1
+L = -1
+M = -1
+N = -1
+O = -1
+P = -1
+Q = -1
+R = -1
+S = -1
+T = -1
+U = -1
+V = -1
+W = -1
+X = -1
+Y = -1
+Z = -1
+
+[AUTOZOOM]
+Enabled = No
+IntegerCoefs = No
+FixedSize = No
+Width = 640
+Height = 480
+
+[NFOSMESA]
+ChannelSize = 0
+LibGL = libGL.so
+LibOSMesa = libOSMesa.so
+
+[PARALLEL]
+Type = file
+File = stderr
+Parport = /dev/parport0
+
+[SERIAL]
+Serport = /dev/ttyS0
+
+[NATFEATS]
+CDROM = sdl
+Vdi = soft
+
+[NFVDI]
+UseHostMouseCursor = No
+
+[AUDIO]
+Frequency = 22050
+Channels = 2
+Bits = 16
+Samples = 1024
+
+[JOYSTICKS]
+Ikbd0 = -1
+Ikbd1 = 0
+JoypadA = -1
+JoypadAButtons = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
+JoypadB = -1
+JoypadBButtons = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
diff --git a/target/m68k/kernel/aranym-m68k b/target/m68k/kernel/aranym-m68k
index 93bf0022f..ac513fdc6 100644
--- a/target/m68k/kernel/aranym-m68k
+++ b/target/m68k/kernel/aranym-m68k
@@ -4,12 +4,8 @@ CONFIG_M68KCLASSIC=y
CONFIG_M68040=y
CONFIG_FPU=y
CONFIG_ATARI=y
-CONFIG_NET_VENDOR_AMD=y
-CONFIG_NET_CADENCE=y
+CONFIG_NATFEAT=y
+CONFIG_NFETH=y
CONFIG_SERIO=y
CONFIG_SERIO_SERPORT=y
CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-10 19:36:19 +0000