summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/base-files/Makefile8
-rw-r--r--package/base-files/src/etc/fstab9
-rw-r--r--package/base-files/src/etc/init.d/boot25
-rw-r--r--package/base-files/src/etc/init.d/mount10
-rwxr-xr-xpackage/base-files/src/etc/init.d/rcS7
-rwxr-xr-xpackage/base-files/src/etc/init.d/umount14
-rw-r--r--package/base-files/src/etc/inittab6
-rwxr-xr-xpackage/base-files/src/etc/network/if-post-down.d/03-wireless1
-rw-r--r--package/base-files/src/etc/profile1
-rwxr-xr-xpackage/base-files/src/init31
-rw-r--r--package/cdrtools/Makefile2
-rw-r--r--package/cmake/Makefile2
-rw-r--r--package/ecj/Makefile2
-rw-r--r--package/gcj/Makefile4
-rw-r--r--package/gettext-tiny/Makefile4
-rw-r--r--package/id3lib/Makefile2
-rw-r--r--package/id3lib/patches/patch-configure20
-rw-r--r--package/jikes/Makefile3
-rw-r--r--package/ruby-ldap/Makefile2
-rw-r--r--package/upower/Makefile43
-rw-r--r--package/upower/patches/patch-Makefile_in20
21 files changed, 86 insertions, 130 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 9323b25ad..a298d108b 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:= 66
+PKG_RELEASE:= 67
PKG_SECTION:= base
PKG_DESCR:= basic files and scripts
PKG_BUILDDEP:= pkgconf-host file-host
@@ -33,13 +33,13 @@ endif
$(SED) 's,@HOST@,$(ADK_HOST),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
$(SED) 's,@VENDOR@,$(ADK_VENDOR),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
echo /bin/sh >${IDIR_BASE_FILES}/etc/shells
+ echo /bin/mksh >>${IDIR_BASE_FILES}/etc/shells
+ifneq (${ADK_PACKAGE_ASH},)
echo /bin/ash >>${IDIR_BASE_FILES}/etc/shells
+endif
ifneq (${ADK_PACKAGE_BASH},)
echo /bin/bash >>${IDIR_BASE_FILES}/etc/shells
endif
-ifneq (${ADK_PACKAGE_MKSH},)
- echo /bin/mksh >>${IDIR_BASE_FILES}/etc/shells
-endif
ifneq (${ADK_PACKAGE_ZSH},)
echo /bin/zsh >>${IDIR_BASE_FILES}/etc/shells
endif
diff --git a/package/base-files/src/etc/fstab b/package/base-files/src/etc/fstab
new file mode 100644
index 000000000..fafa1d56e
--- /dev/null
+++ b/package/base-files/src/etc/fstab
@@ -0,0 +1,9 @@
+# /etc/fstab: static file system information.
+#
+# <file system> <mount pt> <type> <options> <dump> <pass>
+#/dev/root / ext2 rw,noauto 0 1
+proc /proc proc defaults 0 0
+devpts /dev/pts devpts defaults,gid=5,mode=620 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
+tmpfs /tmp tmpfs mode=1777 0 0
+sysfs /sys sysfs defaults 0 0
diff --git a/package/base-files/src/etc/init.d/boot b/package/base-files/src/etc/init.d/boot
index df2c493d7..b859d1d89 100644
--- a/package/base-files/src/etc/init.d/boot
+++ b/package/base-files/src/etc/init.d/boot
@@ -4,6 +4,29 @@
. /etc/functions.sh
+# disable kernel messages
+echo 0 > /proc/sys/kernel/printk
+
+# remount /dev with smaller size
+mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev
+
+# remount /tmp with smaller size
+size=$(cat /etc/tmpfs 2>/dev/null)
+[ -z $size ] && size=2048
+mount -o remount,nosuid,nodev,mode=1777,size=${size}k -t tmpfs tmpfs /tmp
+
+# start mdev dynamic device node management
+echo >/dev/mdev.seq
+echo "/sbin/mdev" >/proc/sys/kernel/hotplug
+mdev -s
+
+# seed some random
+cat /etc/.rnd >/dev/urandom 2>&1
+
+# setup cfgfs
+[ -x /sbin/cfgfs ] && { cfgfs setup; mount -o remount,ro /;} || mount -o remount,rw /
+
+# create some useful directories in tmpfs
mkdir -p /var/log
mkdir -p /var/run
touch /var/log/lastlog
@@ -22,6 +45,4 @@ for f in /etc/modules.d/*; do
[[ -e $f ]] && load_modules /etc/modules.d/*
break
done
-# settle down, after module load
-sleep 2
exit 0
diff --git a/package/base-files/src/etc/init.d/mount b/package/base-files/src/etc/init.d/mount
deleted file mode 100644
index 6c59d7bab..000000000
--- a/package/base-files/src/etc/init.d/mount
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-#INIT 60
-[[ $1 = autostart ]] || exit 0
-
-# any lvm volumes to activate?
-[ -x /usr/sbin/lvm ] && { lvm vgscan; lvm vgchange -ay;}
-# check and mount all filesystems not /
-[ -f /etc/fstab ] && { fsck -p >/dev/null; mount -a; swapon -a;}
-
-exit 0
diff --git a/package/base-files/src/etc/init.d/rcS b/package/base-files/src/etc/init.d/rcS
index 55c86729c..d34cce6e9 100755
--- a/package/base-files/src/etc/init.d/rcS
+++ b/package/base-files/src/etc/init.d/rcS
@@ -1,10 +1,11 @@
#!/bin/sh
+echo "System initialization ..."
export PATH=/bin:/sbin:/usr/bin:/usr/sbin
+ln -s /proc/self/fd/2 /dev/stderr
{
grep '^#INIT ' /etc/init.d/* | \
sort -nk2 | \
while read line; do
- sh ${line%%:*} autostart 2>&1
+ sh ${line%%:*} autostart
done
- test -e /etc/init.d/boot.local && (/bin/sh /etc/init.d/boot.local) 2>&1
-} | logger -p 6 -t '' &
+} | tee /dev/stderr |logger -p 6 -t ''
diff --git a/package/base-files/src/etc/init.d/umount b/package/base-files/src/etc/init.d/umount
deleted file mode 100755
index 49bd5a020..000000000
--- a/package/base-files/src/etc/init.d/umount
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-#INIT 55
-
-case $1 in
-autostop)
- cd /
- sync
- for i in $(grep -v ^# /etc/fstab 2>/dev/null|awk '{ print $2 }'|grep -v none);do
- umount $i 2>/dev/null
- done
- ;;
-esac
-exit 0
-
diff --git a/package/base-files/src/etc/inittab b/package/base-files/src/etc/inittab
index 79e69d931..eb00b00ef 100644
--- a/package/base-files/src/etc/inittab
+++ b/package/base-files/src/etc/inittab
@@ -1,2 +1,8 @@
+null::sysinit:/bin/mount -t proc proc /proc
+null::sysinit:/bin/mkdir -p /dev/pts
+null::sysinit:/bin/mkdir -p /dev/shm
+null::sysinit:/bin/mount -a
::sysinit:/etc/init.d/rcS
::shutdown:/etc/init.d/rcK
+null::shutdown:/bin/umount -a -r
+null::shutdown:/sbin/swapoff -a
diff --git a/package/base-files/src/etc/network/if-post-down.d/03-wireless b/package/base-files/src/etc/network/if-post-down.d/03-wireless
index 67c01714e..77bca475b 100755
--- a/package/base-files/src/etc/network/if-post-down.d/03-wireless
+++ b/package/base-files/src/etc/network/if-post-down.d/03-wireless
@@ -1,5 +1,4 @@
#!/bin/sh
-set -x
set -e
[ "${IFACE%%[0-9]*}" = "wlan" ] || exit 0
diff --git a/package/base-files/src/etc/profile b/package/base-files/src/etc/profile
index 96f03b980..ce425b54c 100644
--- a/package/base-files/src/etc/profile
+++ b/package/base-files/src/etc/profile
@@ -1,5 +1,4 @@
export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-export TERM=linux
export EDITOR=/bin/vi
if [[ $(id -u) = 0 ]]; then
export PS1='`whoami`@`hostname`:`pwd` # '
diff --git a/package/base-files/src/init b/package/base-files/src/init
index ad519e96d..a27548217 100755
--- a/package/base-files/src/init
+++ b/package/base-files/src/init
@@ -1,26 +1,7 @@
#!/bin/sh
-echo "System initialization ..."
-export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-mount -t devtmpfs devtmpfs /dev >/dev/null 2>&1
-mount -nt proc proc /proc
-echo 0 > /proc/sys/kernel/printk
-mount -o nosuid,nodev,noexec -t sysfs sysfs /sys
-[ ! -f /etc/notmpfs ] && {
- size=$(cat /etc/tmpfs 2>/dev/null)
- [ -z $size ] && size=2048
- mount -o nosuid,nodev,mode=1777,size=${size}k -t tmpfs tmpfs /tmp
-}
-mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev
-[ -d /dev/pts ] || mkdir /dev/pts
-[ -d /dev/shm ] || mkdir /dev/shm
-mount -o nosuid,noexec -t tmpfs tmpfs /dev/shm
-mount -o nosuid,noexec -t devpts devpts /dev/pts
-echo >/dev/mdev.seq
-echo "/sbin/mdev" >/proc/sys/kernel/hotplug
-mdev -s
-cat /etc/.rnd >/dev/urandom 2>&1
-[ -x /installer ] && { /installer; }
-[ -x /kexecinit ] && { /kexecinit; }
-[ -x /cryptinit ] && { /cryptinit; exec switch_root /mnt "/init";}
-[ -x /sbin/cfgfs ] && { cfgfs setup; mount -o remount,ro /;} || mount -o remount,rw /
-exec /sbin/init
+# devtmpfs does not get automounted for initramfs
+/bin/mount -t devtmpfs devtmpfs /dev
+exec 0</dev/console
+exec 1>/dev/console
+exec 2>/dev/console
+exec /sbin/init $*
diff --git a/package/cdrtools/Makefile b/package/cdrtools/Makefile
index 1b195fc3f..6bf16ab17 100644
--- a/package/cdrtools/Makefile
+++ b/package/cdrtools/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= misc
PKG_URL:= http://cdrecord.berlios.de/private/cdrecord.html
PKG_SITES:= http://openadk.org/
+PKG_CFLINE_CDRTOOLS:= depends on ADK_BROKEN
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,CDRTOOLS,cdrtools,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/cmake/Makefile b/package/cmake/Makefile
index 1079227f2..6cdf53b0b 100644
--- a/package/cmake/Makefile
+++ b/package/cmake/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= lang
PKG_URL:= http://www.cmake.org/
PKG_SITES:= http://www.cmake.org/files/v2.8/
+PKG_CFLINE_CMAKE:= depends on ADK_BROKEN
+
include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
diff --git a/package/ecj/Makefile b/package/ecj/Makefile
index 92898307b..8e4dc6f94 100644
--- a/package/ecj/Makefile
+++ b/package/ecj/Makefile
@@ -24,7 +24,7 @@ ecj-hostinstall:
$(STAGING_HOST_DIR)/usr/bin/gcj -lgcj -O2 -findirect-dispatch \
-o ${STAGING_HOST_DIR}/usr/bin/ecj.native \
--main=org.eclipse.jdt.internal.compiler.batch.Main \
- $(DISTDIR)/ecj.jar
+ $(DL_DIR)/ecj.jar
echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/ecj.native \$$@" > \
${STAGING_HOST_DIR}/usr/bin/ecj
chmod u+x ${STAGING_HOST_DIR}/usr/bin/ecj
diff --git a/package/gcj/Makefile b/package/gcj/Makefile
index 5ff8cc810..15c56b204 100644
--- a/package/gcj/Makefile
+++ b/package/gcj/Makefile
@@ -41,8 +41,8 @@ HOST_CONFIGURE_ARGS:= --enable-dependency-tracking \
--disable-bootstrap
post-extract:
- (cd $(DISTDIR); wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-4.9.jar)
- (cd $(WRKBUILD); $(CP) $(DISTDIR)/ecj.jar .)
+ (cd $(DL_DIR); wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-4.9.jar)
+ (cd $(WRKBUILD); $(CP) $(DL_DIR)/ecj.jar .)
include ${TOPDIR}/mk/host-bottom.mk
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gettext-tiny/Makefile b/package/gettext-tiny/Makefile
index b483b838c..a09dc3be5 100644
--- a/package/gettext-tiny/Makefile
+++ b/package/gettext-tiny/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= gettext-tiny
-PKG_VERSION:= 0.0.3
+PKG_VERSION:= 0.0.4
PKG_RELEASE:= 1
-PKG_MD5SUM:= 3af6fd8a9042603b61f634b1c6f49e7e
+PKG_MD5SUM:= 09f6a74945df5961080234f7851f352c
PKG_DESCR:= Gettext stub and replacement
PKG_SECTION:= libs
PKG_BUILDDEP:= gettext-tiny-host
diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile
index 389b4f39a..19d678a7a 100644
--- a/package/id3lib/Makefile
+++ b/package/id3lib/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= id3lib
PKG_VERSION:= 3.8.3
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 19f27ddd2dda4b2d26a559a4f0f402a7
PKG_DESCR:= An ID3v1/ID3v2 tagging library
PKG_SECTION:= libs
diff --git a/package/id3lib/patches/patch-configure b/package/id3lib/patches/patch-configure
index 6853215af..10b0add38 100644
--- a/package/id3lib/patches/patch-configure
+++ b/package/id3lib/patches/patch-configure
@@ -1,6 +1,24 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
--- id3lib-3.8.3.orig/configure 2003-03-02 01:23:00.000000000 +0100
-+++ id3lib-3.8.3/configure 2008-12-15 13:14:18.000000000 +0100
++++ id3lib-3.8.3/configure 2014-03-08 12:16:00.000000000 +0100
+@@ -3353,7 +3353,7 @@ irix5* | irix6*)
+ ;;
+
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-*)
+ case $host_cpu in
+ alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
+ lt_cv_deplibs_check_method=pass_all ;;
+@@ -6142,7 +6142,7 @@ linux-gnuoldld* | linux-gnuaout* | linux
+ ;;
+
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
@@ -10296,7 +10296,7 @@ done
for ac_header in \
diff --git a/package/jikes/Makefile b/package/jikes/Makefile
index 7404fc123..be7e6a749 100644
--- a/package/jikes/Makefile
+++ b/package/jikes/Makefile
@@ -8,6 +8,7 @@ PKG_VERSION:= 1.22
PKG_RELEASE:= 1
PKG_MD5SUM:= cda958c7fef6b43b803e1d1ef9afcb85
PKG_DESCR:= jikes java compiler
+PKG_BUILDDEP:= jikes-host
PKG_SECTION:= lang
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/}
@@ -17,6 +18,7 @@ include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
$(eval $(call HOST_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE}))
+$(eval $(call PKG_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
HOST_STYLE:= auto
@@ -26,6 +28,7 @@ hostpost-install:
$(CP) ${STAGING_HOST_DIR}/usr/bin/jikes ${STAGING_HOST_DIR}/usr/lib/jvm/bin/javac
$(CP) ${STAGING_HOST_DIR}/usr/bin/jikes ${STAGING_HOST_DIR}/usr/lib/jvm/jre/bin/javac
+jikes-install:
include ${TOPDIR}/mk/host-bottom.mk
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ruby-ldap/Makefile b/package/ruby-ldap/Makefile
index 6289c1cb8..4a332b32e 100644
--- a/package/ruby-ldap/Makefile
+++ b/package/ruby-ldap/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP:= ruby openldap
PKG_URL:= http://ruby-ldap.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ruby-ldap/0.9.8/}
+PKG_CFLINE_RUBY_LDAP:= depends on ADK_BROKEN
+
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
diff --git a/package/upower/Makefile b/package/upower/Makefile
deleted file mode 100644
index 99c721879..000000000
--- a/package/upower/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:= upower
-PKG_VERSION:= 0.99.0
-PKG_RELEASE:= 2
-PKG_MD5SUM:= 14f43bc13353e23e7280863f33ac50d2
-PKG_DESCR:= powermanagement
-PKG_SECTION:= misc
-PKG_BUILDDEP:= glib dbus-glib polkit eudev
-PKG_DEPENDS:= glib dbus-glib polkit libgudev
-PKG_URL:= http://upower.freedesktop.org/
-PKG_SITES:= http://upower.freedesktop.org/releases/
-
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,UPOWER,upower,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIGURE_ARGS+= --without-systemdutildir \
- --disable-rpath
-
-upower-install:
- $(INSTALL_DIR) $(IDIR_UPOWER)/etc
- $(CP) $(WRKINST)/etc/* \
- $(IDIR_UPOWER)/etc
- $(INSTALL_DIR) $(IDIR_UPOWER)/usr/lib
- $(CP) $(WRKINST)/usr/lib/libupower*.so* \
- $(IDIR_UPOWER)/usr/lib
- $(INSTALL_DIR) $(IDIR_UPOWER)/usr/sbin
- $(INSTALL_BIN) $(WRKINST)/usr/libexec/upowerd \
- $(IDIR_UPOWER)/usr/sbin
- $(INSTALL_DIR) $(IDIR_UPOWER)/usr/bin
- $(INSTALL_BIN) $(WRKINST)/usr/bin/upower \
- $(IDIR_UPOWER)/usr/bin
- $(INSTALL_DIR) $(IDIR_UPOWER)/usr/share/dbus-1
- $(CP) $(WRKINST)/usr/share/dbus-1/* \
- $(IDIR_UPOWER)/usr/share/dbus-1
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/upower/patches/patch-Makefile_in b/package/upower/patches/patch-Makefile_in
deleted file mode 100644
index 7709ee096..000000000
--- a/package/upower/patches/patch-Makefile_in
+++ /dev/null
@@ -1,20 +0,0 @@
---- upower-0.99.0.orig/Makefile.in 2013-10-29 11:39:06.000000000 +0100
-+++ upower-0.99.0/Makefile.in 2014-01-10 17:09:06.000000000 +0100
-@@ -199,7 +199,7 @@ am__define_uniq_tagged_files = \
- ETAGS = etags
- CTAGS = ctags
- CSCOPE = cscope
--DIST_SUBDIRS = etc libupower-glib src doc tools po rules
-+DIST_SUBDIRS = etc libupower-glib src tools po rules
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
-@@ -439,7 +439,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- udevrulesdir = @udevrulesdir@
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
--SUBDIRS = etc libupower-glib src doc tools po $(am__append_1)
-+SUBDIRS = etc libupower-glib src tools po $(am__append_1)
- EXTRA_DIST = \
- HACKING \
- ChangeLog
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-30 08:55:27 +0000