summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-10-19 09:52:45 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-10-19 09:52:45 +0200
commit794a4a75d2e2c513e55b8962ad9e8e470dd82ba8 (patch)
tree451fd95b4cc5397612a38a13326dc24add046fb1 /package
parent2f172e3c8d13eb5810d39b3e86c5fae388ba2bfa (diff)
make virsh, virt-install and kvm usable on shuttle pc
Diffstat (limited to 'package')
-rw-r--r--package/base-files/src/etc/banner8
-rwxr-xr-xpackage/base-files/src/init2
-rw-r--r--package/cfgfs/Makefile4
-rw-r--r--package/cfgfs/src/fwcf.sh8
-rw-r--r--package/dmidecode/Makefile26
-rw-r--r--package/dmidecode/patches/patch-Makefile22
-rw-r--r--package/dmidecode/patches/patch-Makefile.orig20
-rw-r--r--package/gperf/Makefile1
-rw-r--r--package/iptables/Makefile18
-rw-r--r--package/libvirt/Makefile11
-rwxr-xr-xpackage/libvirt/files/libvirt.init26
-rw-r--r--package/libvirt/files/libvirt.postinst3
-rw-r--r--package/qemu/Makefile13
-rw-r--r--package/samba/Makefile4
-rw-r--r--package/virtinst/Makefile2
-rw-r--r--package/xf86-video-ati/Makefile30
16 files changed, 171 insertions, 27 deletions
diff --git a/package/base-files/src/etc/banner b/package/base-files/src/etc/banner
index cc967559a..1ac725fd1 100644
--- a/package/base-files/src/etc/banner
+++ b/package/base-files/src/etc/banner
@@ -1,2 +1,8 @@
- Linux created with OpenADK
+ ___ _ ____ _ __
+ / _ \ _ __ ___ _ __ / \ | _ \| |/ /
+| | | | '_ \ / _ \ '_ \ / _ \ | | | | ' /
+| |_| | |_) | __/ | | |/ ___ \| |_| | . \
+ \___/| .__/ \___|_| |_/_/ \_\____/|_|\_\
+ |_|
+ Linux created with OpenADK
diff --git a/package/base-files/src/init b/package/base-files/src/init
index c57149fe3..cfd264c3e 100755
--- a/package/base-files/src/init
+++ b/package/base-files/src/init
@@ -22,5 +22,5 @@ cat /etc/.rnd >/dev/urandom 2>&1
[ -x /kexecinit ] && { /kexecinit; }
[ -x /cryptinit ] && { /cryptinit; exec switch_root /mnt "/init";}
[ -x /sbin/cfgfs ] && { cfgfs setup; mount -o remount,ro /;} || mount -o remount,rw /
-[ -f /etc/fstab ] && { fsck -p >/dev/null; mount -a;}
+[ -f /etc/fstab ] && { fsck -p >/dev/null; mount -a; swapon -a;}
exec /sbin/init
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index 6fa32318e..7dd161802 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -4,8 +4,8 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= cfgfs
-PKG_VERSION:= 1.0.8
-PKG_RELEASE:= 7
+PKG_VERSION:= 1.0.9
+PKG_RELEASE:= 1
PKG_DESCR:= compressed config filesystem
PKG_SECTION:= base
PKG_URL:= http://openadk.org/
diff --git a/package/cfgfs/src/fwcf.sh b/package/cfgfs/src/fwcf.sh
index 0fac5ec1f..8fec0422d 100644
--- a/package/cfgfs/src/fwcf.sh
+++ b/package/cfgfs/src/fwcf.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# Copyright (c) 2006, 2007
# Thorsten Glaser <tg@mirbsd.de>
-# Copyright (c) 2009, 2010
+# Copyright (c) 2009, 2010, 2011
# Waldemar Brodkorb <wbx@openadk.org>
#
# Provided that these terms and disclaimer and all copyright notices
@@ -42,7 +42,7 @@
export PATH=/bin:/sbin:/usr/bin:/usr/sbin
wd=$(pwd)
cd /
-what='Configuration Filesystem Utility (cfgfs), Version 1.08'
+what='Configuration Filesystem Utility (cfgfs), Version 1.09'
who=$(id -u)
if [ $who -ne 0 ]; then
@@ -114,7 +114,6 @@ EOF
esac
mtd=0
-
if [ -x /sbin/nand ];then
mtdtool=/sbin/nand
fi
@@ -129,6 +128,9 @@ rootdisk=$(readlink /dev/root)
rootdisk=${rootdisk%p*}
rootdisk=${rootdisk%[1-9]}
part=$(fdisk -l /dev/$rootdisk 2>/dev/null|awk '$5 == 88 { print $1 }')
+if [ -f .cfgfs ];then
+ . /.cfgfs
+fi
if [ -z $part ]; then
# fallback to /dev/sda in case of encrypted root
part=$(fdisk -l /dev/sda 2>/dev/null|awk '$5 == 88 { print $1 }')
diff --git a/package/dmidecode/Makefile b/package/dmidecode/Makefile
new file mode 100644
index 000000000..4c037298c
--- /dev/null
+++ b/package/dmidecode/Makefile
@@ -0,0 +1,26 @@
+# 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:= dmidecode
+PKG_VERSION:= 2.11
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 9fddbbc3e330bee5950b8b5d424a57cb
+PKG_DESCR:= reports information about your system's hardware
+PKG_SECTION:= misc
+PKG_URL:= http://www.nongnu.org/dmidecode/
+PKG_SITES:= http://download.savannah.gnu.org/releases/dmidecode/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,DMIDECODE,dmidecode,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:= manual
+
+dmidecode-install:
+ $(INSTALL_DIR) $(IDIR_DMIDECODE)/usr/sbin
+ $(INSTALL_BIN) $(WRKINST)/usr/sbin/dmidecode \
+ $(IDIR_DMIDECODE)/usr/sbin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dmidecode/patches/patch-Makefile b/package/dmidecode/patches/patch-Makefile
new file mode 100644
index 000000000..cf37262cb
--- /dev/null
+++ b/package/dmidecode/patches/patch-Makefile
@@ -0,0 +1,22 @@
+--- dmidecode-2.11.orig/Makefile 2010-10-11 16:08:16.000000000 +0200
++++ dmidecode-2.11/Makefile 2011-10-17 19:22:27.000000000 +0200
+@@ -12,8 +12,8 @@
+ # (at your option) any later version.
+ #
+
+-CC = gcc
+-CFLAGS = -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
++CC ?= gcc
++CFLAGS ?= -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
+ -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef
+ #CFLAGS += -DBIGENDIAN
+ #CFLAGS += -DALIGNMENT_WORKAROUND
+@@ -26,7 +26,7 @@ CFLAGS += -O2
+ LDFLAGS =
+
+ DESTDIR =
+-prefix = /usr/local
++prefix = /usr
+ sbindir = $(prefix)/sbin
+ mandir = $(prefix)/share/man
+ man8dir = $(mandir)/man8
diff --git a/package/dmidecode/patches/patch-Makefile.orig b/package/dmidecode/patches/patch-Makefile.orig
new file mode 100644
index 000000000..fcd3c6dd7
--- /dev/null
+++ b/package/dmidecode/patches/patch-Makefile.orig
@@ -0,0 +1,20 @@
+--- dmidecode-2.11.orig/Makefile 2010-10-11 16:08:16.000000000 +0200
++++ dmidecode-2.11/Makefile 2011-10-17 19:21:58.000000000 +0200
+@@ -12,7 +12,7 @@
+ # (at your option) any later version.
+ #
+
+-CC = gcc
++CC ?= gcc
+ CFLAGS = -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
+ -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef
+ #CFLAGS += -DBIGENDIAN
+@@ -26,7 +26,7 @@ CFLAGS += -O2
+ LDFLAGS =
+
+ DESTDIR =
+-prefix = /usr/local
++prefix = /usr
+ sbindir = $(prefix)/sbin
+ mandir = $(prefix)/share/man
+ man8dir = $(mandir)/man8
diff --git a/package/gperf/Makefile b/package/gperf/Makefile
index be2b4b4ce..1a8608e63 100644
--- a/package/gperf/Makefile
+++ b/package/gperf/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= c1f1db32fb6598d6a93e6e88796a8632
PKG_DESCR:= perfect hash function generator
PKG_SECTION:= lang
+PKG_DEPENDS:= libstdc++
PKG_URL:= http://www.gnu.org/software/gperf/
PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/}
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 040fbcb96..b03957080 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -14,12 +14,12 @@ PKG_DEPENDS+= kmod-nf-conntrack-ipv4 kmod-nf-nat
PKG_DEPENDS+= kmod-ip-nf-target-masquerade kmod-ip-nf-target-reject
PKG_DEPENDS+= kmod-ip-nf-filter kmod-ip-nf-match-state
PKG_DEPENDS+= kmod-netfilter-xt-target-tcpmss
-PKG_DEPENDS6:= kmod-ip6-nf-iptables kmod-nf-conntrack-ipv6
-PKG_DEPENDS6+= kmod-ip6-nf-filter kmod-ip6-nf-target-reject
+PKG_DEPENDS+= kmod-ip6-nf-iptables kmod-nf-conntrack-ipv6
+PKG_DEPENDS+= kmod-ip6-nf-filter kmod-ip6-nf-target-reject
PKG_URL:= http://www.netfilter.org/
PKG_SITES:= http://www.netfilter.org/projects/iptables/files/
-PKG_SUBPKGS:= IPTABLES IP6TABLES IPTABLES_DEV
+PKG_SUBPKGS:= IPTABLES IPTABLES_DEV
PKGSC_IPTABLES_DEV:= devel
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
@@ -32,7 +32,6 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,IPTABLES_DEV,iptables-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKGSC_IPTABLES_DEV}))
-$(eval $(call PKG_template,IP6TABLES,ip6tables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS6},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --enable-devel
@@ -40,18 +39,17 @@ iptables-install:
${INSTALL_DIR} ${IDIR_IPTABLES}/{usr/lib,etc,usr/sbin}
${INSTALL_DATA} ./files/firewall.conf ${IDIR_IPTABLES}/etc
${CP} ${WRKINST}/usr/sbin/iptables* ${IDIR_IPTABLES}/usr/sbin
+ ${CP} ${WRKINST}/usr/sbin/xtables* ${IDIR_IPTABLES}/usr/sbin
${CP} ${WRKINST}/usr/lib/libiptc.so* ${IDIR_IPTABLES}/usr/lib
${CP} ${WRKINST}/usr/lib/libip4tc.so* ${IDIR_IPTABLES}/usr/lib
${CP} ${WRKINST}/usr/lib/libxtables.so* ${IDIR_IPTABLES}/usr/lib
+ ${INSTALL_DIR} ${IDIR_IPTABLES}/{usr/lib,etc,usr/sbin}
+ ${INSTALL_DATA} ./files/firewall6.conf ${IDIR_IPTABLES}/etc
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/ip6tables ${IDIR_IPTABLES}/usr/sbin
+ ${CP} ${WRKINST}/usr/lib/libip6tc.so* ${IDIR_IPTABLES}/usr/lib
iptables-dev-install:
${INSTALL_DIR} ${IDIR_IPTABLES_DEV}/usr/include
${CP} ${WRKINST}/usr/include/* ${IDIR_IPTABLES_DEV}/usr/include
-ip6tables-install:
- ${INSTALL_DIR} ${IDIR_IP6TABLES}/{usr/lib,etc,usr/sbin}
- ${INSTALL_DATA} ./files/firewall6.conf ${IDIR_IP6TABLES}/etc
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/ip6tables ${IDIR_IP6TABLES}/usr/sbin
- ${CP} ${WRKINST}/usr/lib/libip6tc.so* ${IDIR_IP6TABLES}/usr/lib
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile
index 6d3b65d19..1e09ad648 100644
--- a/package/libvirt/Makefile
+++ b/package/libvirt/Makefile
@@ -11,7 +11,8 @@ PKG_DESCR:= virtualization API
PKG_SECTION:= libs
PKG_BUILDDEP:= libxml2 gnutls python2 libpcap parted udev
PKG_DEPENDS:= libxml2 libgnutls python2 libpcap libreadline
-PKG_DEPENDS+= libintl
+PKG_DEPENDS+= libintl dmidecode kmod-netfilter-xt-target-checksum
+PKG_DEPENDS+= dnsmasq qemu
PKG_URL:= http://www.libvirt.org/
PKG_SITES:= ftp://libvirt.org/libvirt/
@@ -24,7 +25,10 @@ $(eval $(call PKG_template,LIBVIRT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${P
include ${TOPDIR}/mk/python.mk
-CONFIGURE_ENV+= gl_cv_warn__fstack_protector_all=no
+CONFIGURE_ENV+= gl_cv_warn__fstack_protector_all=no \
+ ac_cv_path_IPTABLES_PATH=/usr/sbin/iptables \
+ ac_cv_path_IP6TABLES_PATH=/usr/sbin/ip6tables \
+ ac_cv_path_IP_PATH=/bin/ip
CONFIGURE_ARGS+= --without-xen \
--without-uml \
--without-esx \
@@ -38,6 +42,9 @@ CONFIGURE_ARGS+= --without-xen \
post-install:
${INSTALL_DIR} ${IDIR_LIBVIRT}/usr/lib ${IDIR_LIBVIRT}/usr/bin
${INSTALL_DIR} ${IDIR_LIBVIRT}/etc/libvirt ${IDIR_LIBVIRT}/usr/sbin
+ ${INSTALL_DIR} ${IDIR_LIBVIRT}/usr/share/libvirt
+ $(CP) $(WRKINST)/usr/share/libvirt/* \
+ ${IDIR_LIBVIRT}/usr/share/libvirt
${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
diff --git a/package/libvirt/files/libvirt.init b/package/libvirt/files/libvirt.init
new file mode 100755
index 000000000..2644e1a1b
--- /dev/null
+++ b/package/libvirt/files/libvirt.init
@@ -0,0 +1,26 @@
+#!/bin/sh
+#PKG libvirt
+#INIT 80
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+ test x"$libvirtd" = x"NO" && exit 0
+ exec sh $0 start
+ ;;
+start)
+ /usr/sbin/libvirtd -dv
+ ;;
+stop)
+ kill $(pgrep -f /usr/sbin/libvirtd)
+ ;;
+restart)
+ sh $0 stop
+ sh $0 start
+ ;;
+*)
+ echo "usage: $0 {start | stop | restart}"
+ exit 1
+esac
+exit $?
diff --git a/package/libvirt/files/libvirt.postinst b/package/libvirt/files/libvirt.postinst
new file mode 100644
index 000000000..4c39b14f0
--- /dev/null
+++ b/package/libvirt/files/libvirt.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf libvirtd libvirtd NO
diff --git a/package/qemu/Makefile b/package/qemu/Makefile
index 7074bf80c..63f4040d0 100644
--- a/package/qemu/Makefile
+++ b/package/qemu/Makefile
@@ -4,18 +4,18 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= qemu
-PKG_VERSION:= 0.14.1
+PKG_VERSION:= 0.15.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= b6c713a8db638e173af53a62d5178640
+PKG_MD5SUM:= 34f17737baaf1b3495c89cd6d4a607ed
PKG_DESCR:= cpu and system emulator
PKG_SECTION:= misc
-PKG_DEPENDS:= zlib libsdl
-PKG_BUILDDEP:= zlib sdl
+PKG_DEPENDS:= zlib libsdl libpng
+PKG_BUILDDEP:= zlib sdl libpng
PKG_URL:= http://wwww.qemu.org/
-PKG_SITES:= http://download.savannah.gnu.org/releases/qemu/
+PKG_SITES:= http://wiki.qemu.org/download/
PKG_ARCH_DEPENDS:= native x86 x86_64
-PKG_SYSTEM_DEPENDS:= ibm-x40
+PKG_SYSTEM_DEPENDS:= ibm-x40 shuttle-sa76
include $(TOPDIR)/mk/package.mk
@@ -26,6 +26,7 @@ CONFIG_STYLE:= minimal
CONFIGURE_ARGS+= --host-cc=$(CC_FOR_BUILD) \
--prefix=/usr \
--sysconfdir=/etc \
+ --enable-kvm \
--bindir=/usr/bin
TARGET_LDFLAGS+= -pthread -lm -lrt
diff --git a/package/samba/Makefile b/package/samba/Makefile
index 0485febc2..b3658cdbc 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -29,7 +29,9 @@ CONFIGURE_ENV+= samba_cv_CC_NEGATIVE_ENUM_VALUES=no \
samba_cv_USE_SETRESUID=no \
ac_cv_lib_ext_nsl_connect=no \
ac_cv_search_yp_get_default_domain=no \
- ac_cv_lib_ext_nsl_gethostbyname=no
+ ac_cv_lib_ext_nsl_gethostbyname=no \
+ ac_cv_file__proc_sys_kernel_core_pattern=yes \
+ libreplace_cv_HAVE_GETADDRINFO=no
CONFIGURE_ARGS+= --libdir=/usr/lib/samba \
--localstatedir=/var/log/samba \
--with-configdir=/etc/samba \
diff --git a/package/virtinst/Makefile b/package/virtinst/Makefile
index 4c2414920..8c3aba0d5 100644
--- a/package/virtinst/Makefile
+++ b/package/virtinst/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:= d8f6a61d7edbc78129a8b5df2807ad46
PKG_DESCR:= virtual machine installer
PKG_SECTION:= misc
PKG_BUILDDEP:= python2 urlgrabber libxml2 libxslt
-PKG_DEPENDS:= python2 urlgrabber libxml2-python libxslt
+PKG_DEPENDS:= python2 urlgrabber libxml2-python libxslt libvirt
PKG_URL:= http://virt-manager.org/
PKG_SITES:= http://virt-manager.org/download/sources/virtinst/
diff --git a/package/xf86-video-ati/Makefile b/package/xf86-video-ati/Makefile
new file mode 100644
index 000000000..f89f63af5
--- /dev/null
+++ b/package/xf86-video-ati/Makefile
@@ -0,0 +1,30 @@
+# 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:= xf86-video-ati
+PKG_VERSION:= 6.13.2
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 6bb71cff9ad9c5c7b258b2b6c56fdc95
+PKG_DESCR:= X11 driver for ATI VGA chip
+PKG_SECTION:= x11/drivers
+PKG_BUILDDEP:= xorg-server libdrm xf86driproto MesaLib udev
+PKG_DEPENDS:= xorg-server libdrm mesalib udev
+PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_NEED_CXX:= 1
+
+PKG_CFLINE_XF86_VIDEO_ATI:=depends on ADK_TARGET_WITH_VGA
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XF86_VIDEO_ATI,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_ARGS+= --enable-dri
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_XF86_VIDEO_ATI}/usr/lib/xorg/modules/drivers
+ ${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/*.so \
+ ${IDIR_XF86_VIDEO_ATI}/usr/lib/xorg/modules/drivers/
+
+include ${TOPDIR}/mk/pkg-bottom.mk