summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/base-files/src/etc/mdev.conf10
-rw-r--r--package/binutils/Makefile2
-rw-r--r--package/cryptsetup/Makefile6
-rw-r--r--package/dillo/Makefile4
-rw-r--r--package/screen/Makefile1
-rw-r--r--package/vim/Makefile1
-rw-r--r--package/xf86-video-intel/Makefile2
-rw-r--r--package/xf86-video-intel/patches/patch-configure32
-rw-r--r--package/xf86-video-intel/patches/patch-ltmain_sh11
-rw-r--r--target/config/Config.in.runtime9
-rw-r--r--toolchain/binutils/Makefile1
11 files changed, 18 insertions, 61 deletions
diff --git a/package/base-files/src/etc/mdev.conf b/package/base-files/src/etc/mdev.conf
index 4cc06251a..fc63d80d9 100644
--- a/package/base-files/src/etc/mdev.conf
+++ b/package/base-files/src/etc/mdev.conf
@@ -10,11 +10,9 @@ rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc
device-mapper 0:0 660 @test -d /dev/mapper || mkdir /dev/mapper
tun 0:0 660 >net/tun
fb0 root:video 660
-audio root:audio 660 >snd/audio
-dsp root:audio 660 >snd/dsp
-timer root:audio 660 >snd/timer
-controlC0 root:audio 660 >snd/controlC0
-pcmC0D0c root:audio 660 >snd/pcmC0D0c
-pcmC0D0p root:audio 660 >snd/pcmC0D0p
+snd/timer root:audio 660
+snd/controlC0 root:audio 660
+snd/pcmC0D0c root:audio 660
+snd/pcmC0D0p root:audio 660
msr0 root:root 660 @(mkdir -p /dev/cpu/0 && ln -sf /dev/msr0 /dev/cpu/0/msr)
.* 0:0 644 @/lib/mdev/init
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index c66ab6d2d..3abf670cd 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -41,6 +41,8 @@ CONFIGURE_ARGS+= --disable-werror \
else
CONFIGURE_ARGS+= --disable-werror
endif
+# disable honour cflags stuff
+XAKE_FLAGS+= GCC_HONOUR_COPTS=s
post-build:
$(CP) ${WRKBUILD}/libiberty/libiberty.a $(STAGING_TARGET_DIR)/usr/lib
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile
index c98e2e8ac..bf71f5a43 100644
--- a/package/cryptsetup/Makefile
+++ b/package/cryptsetup/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= cryptsetup
-PKG_VERSION:= 1.3.1
-PKG_RELEASE:= 2
-PKG_MD5SUM:= 1f5b5a9d538e8a3c191fb7dd85b9b013
+PKG_VERSION:= 1.6.3
+PKG_RELEASE:= 1
+PKG_MD5SUM:= a7aeb549a543eeac433eadfb6bc67837
PKG_DESCR:= LUKS cryptsetup tools
PKG_SECTION:= crypto
PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt
diff --git a/package/dillo/Makefile b/package/dillo/Makefile
index 56077e946..32fff503b 100644
--- a/package/dillo/Makefile
+++ b/package/dillo/Makefile
@@ -25,8 +25,8 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,DILLO,dillo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_ENV+= PNG_CONFIG=$(STAGING_DIR)/usr/bin/png-config
-TARGET_LDFLAGS+= -liconv -lpng15
+CONFIGURE_ENV+= PNG_CONFIG=$(STAGING_TARGET_DIR)/scripts/libpng-config
+TARGET_LDFLAGS+= -liconv
XAKE_FLAGS+= GCC_HONOUR_COPTS=s
CONFIGURE_ARGS+= --enable-ssl
diff --git a/package/screen/Makefile b/package/screen/Makefile
index 244877847..e448c3b29 100644
--- a/package/screen/Makefile
+++ b/package/screen/Makefile
@@ -18,6 +18,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,SCREEN,screen,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+TARGET_LDFLAGS+= -ltinfo
CONFIGURE_ENV+= $(foreach flag,rename fchmod fchown strerror lstat _exit utimes vsnprintf getcwd setlocale strftime,ac_cv_func_${flag}=yes)
CONFIGURE_ARGS+= --with-sys-screenrc=/etc/screenrc
diff --git a/package/vim/Makefile b/package/vim/Makefile
index f78e1e89f..cd09b8c2f 100644
--- a/package/vim/Makefile
+++ b/package/vim/Makefile
@@ -23,6 +23,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,VIM,vim,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TARGET_CFLAGS+= -lgcc
+TARGET_LDFLAGS+= -ltinfo
CONFIGURE_ENV+= vim_cv_toupper_broken=no \
vim_cv_getcwd_broken=no \
vim_cv_stat_ignores_slash=yes \
diff --git a/package/xf86-video-intel/Makefile b/package/xf86-video-intel/Makefile
index e49d2e81f..dbb22102c 100644
--- a/package/xf86-video-intel/Makefile
+++ b/package/xf86-video-intel/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= xf86-video-intel
PKG_VERSION:= 2.19.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= df7e3644a34e97ead09f083ab48d4457
+PKG_MD5SUM:= a5e655904e8da22acb0d9be1badf9815
PKG_DESCR:= X11 driver for Intel VGA chip
PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server libdrm mesalib
diff --git a/package/xf86-video-intel/patches/patch-configure b/package/xf86-video-intel/patches/patch-configure
deleted file mode 100644
index fe5ca4e86..000000000
--- a/package/xf86-video-intel/patches/patch-configure
+++ /dev/null
@@ -1,32 +0,0 @@
---- xf86-video-intel-2.13.0.orig/configure 2010-09-30 17:46:13.000000000 +0200
-+++ xf86-video-intel-2.13.0/configure 2010-11-24 22:05:13.100685362 +0100
-@@ -11623,9 +11623,6 @@ if test x$DRI != xno; then
- $as_echo_n "checking for ${sdkdir}/dri.h... " >&6; }
- if eval "test \"\${$as_ac_File+set}\"" = set; then :
- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
- if test -r "${sdkdir}/dri.h"; then
- eval "$as_ac_File=yes"
- else
-@@ -11646,9 +11643,6 @@ fi
- $as_echo_n "checking for ${sdkdir}/sarea.h... " >&6; }
- if eval "test \"\${$as_ac_File+set}\"" = set; then :
- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
- if test -r "${sdkdir}/sarea.h"; then
- eval "$as_ac_File=yes"
- else
-@@ -11669,9 +11663,6 @@ fi
- $as_echo_n "checking for ${sdkdir}/dristruct.h... " >&6; }
- if eval "test \"\${$as_ac_File+set}\"" = set; then :
- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
- if test -r "${sdkdir}/dristruct.h"; then
- eval "$as_ac_File=yes"
- else
diff --git a/package/xf86-video-intel/patches/patch-ltmain_sh b/package/xf86-video-intel/patches/patch-ltmain_sh
deleted file mode 100644
index 5cf546d2a..000000000
--- a/package/xf86-video-intel/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- xf86-video-intel-2.13.0.orig/ltmain.sh 2010-02-25 18:09:43.000000000 +0100
-+++ xf86-video-intel-2.13.0/ltmain.sh 2011-01-17 17:47:33.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/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 51b2dde0c..6e580f614 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -23,6 +23,7 @@ config ADK_RUNTIME_PASSWORD
config ADK_RUNTIME_TMPFS_SIZE
string "size of /tmp in memory (kB)"
default "16384" if ADK_HARDWARE_QEMU
+ default "16384" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
default "32768" if ADK_TARGET_SYSTEM_IBM_X40
default "32768" if ADK_TARGET_SYSTEM_RASPBERRY_PI
default "2048"
@@ -37,8 +38,8 @@ config ADK_RUNTIME_TIMEZONE
choice
prompt "Console output on embedded system"
-default ADK_RUNTIME_CONSOLE_BOTH if ADK_TARGET_WITH_VGA && !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_TARGET_SYSTEM_QEMU_SH4 && !ADK_TARGET_SYSTEM_QEMU_SH4EB
-default ADK_RUNTIME_CONSOLE_VGA if ADK_TARGET_SYSTEM_RASPBERRY_PI || ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB
+default ADK_RUNTIME_CONSOLE_BOTH if ADK_TARGET_WITH_VGA && !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_TARGET_SYSTEM_QEMU_SH4 && !ADK_TARGET_SYSTEM_QEMU_SH4EB && !ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+default ADK_RUNTIME_CONSOLE_VGA if ADK_TARGET_SYSTEM_RASPBERRY_PI || ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB || ADK_TARGET_SYSTEM_LEMOTE_YEELONG
default ADK_RUNTIME_CONSOLE_SERIAL
config ADK_RUNTIME_CONSOLE_VGA
@@ -145,10 +146,6 @@ config ADK_BINSH_ZSH
endchoice
-
-
-
-
config ADK_SIMPLE_NETWORK_CONFIG
prompt "simple network configuration"
boolean
diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index 98c92811e..201f8538c 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -36,6 +36,7 @@ $(WRKBUILD)/.configured:
--disable-libtool-lock \
--disable-nls \
--disable-werror \
+ --disable-plugins \
${CONFOPTS} \
);
touch $@
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 21:23:38 +0000