summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/image.mk3
-rw-r--r--package/cups/Makefile8
-rw-r--r--package/giflib/Makefile8
-rw-r--r--package/lm_sensors/Makefile64
-rw-r--r--package/log4cxx/Makefile37
-rw-r--r--package/log4cxx/patches/patch-src_Makefile_am8
-rw-r--r--package/log4cxx/patches/patch-src_Makefile_in11
-rw-r--r--package/log4cxx/patches/patch-src_examples_cpp_console_cpp11
-rw-r--r--package/log4cxx/patches/patch-src_main_cpp_inputstreamreader_cpp10
-rw-r--r--package/log4cxx/patches/patch-src_main_cpp_socketoutputstream_cpp10
-rw-r--r--scripts/dev.cpiobin0 -> 1024 bytes
11 files changed, 169 insertions, 1 deletions
diff --git a/mk/image.mk b/mk/image.mk
index 78b18e716..e6dd06a82 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -103,9 +103,10 @@ ${BUILD_DIR}/${INITRAMFS_PIGGYBACK}: ${TARGET_DIR}
echo "CONFIG_BLK_DEV_INITRD=y" >> ${LINUX_DIR}/.config
echo 'CONFIG_INITRAMFS_SOURCE="${BUILD_DIR}/${INITRAMFS_PIGGYBACK}"' >> \
${LINUX_DIR}/.config
+ cp $(TOPDIR)/scripts/dev.cpio $@
cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \
sed "s#\(.*\)#:0:0::::::\1#" | sort | \
- ${TOOLS_DIR}/cpio -o -C512 -Hnewc -P >$@ 2>/dev/null
+ ${TOOLS_DIR}/cpio -o -C512 -Hnewc -A -P -O $@ 2>/dev/null
${BUILD_DIR}/root.squashfs: ${TARGET_DIR}
${STAGING_HOST_DIR}/bin/mksquashfs ${TARGET_DIR} \
diff --git a/package/cups/Makefile b/package/cups/Makefile
index 762f1832a..6a36d424a 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -17,9 +17,13 @@ PKG_NEED_CXX:= 1
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-source.tar.bz2
+PKG_SUBPKGS:= CUPS CUPS_DEV
+PKGSC_CUPS_DEV:= devel
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CUPS_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_CUPS_DEV}))
CONFIGURE_ENV+= ac_cv_func_sigset=no \
OPTIM='-fPIC'
@@ -80,4 +84,8 @@ post-install:
${CP} ${WRKINST}/usr/sbin/* ${IDIR_CUPS}/usr/sbin/
${CP} ./files/etc/cups/* ${IDIR_CUPS}/etc/cups/
+cups-dev-install:
+ ${INSTALL_DIR} ${IDIR_CUPS_DEV}/usr/include
+ ${CP} ${WRKINST}/usr/include/* ${IDIR_CUPS_DEV}/usr/include
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/giflib/Makefile b/package/giflib/Makefile
index 1259c92f9..2187e05ae 100644
--- a/package/giflib/Makefile
+++ b/package/giflib/Makefile
@@ -12,13 +12,21 @@ PKG_SECTION:= libs
PKG_URL:= http://sourceforge.net/projects/giflib/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=giflib/giflib%204.x/$(PKG_NAME)-$(PKG_VERSION)/}
+PKG_SUBPKGS:= GIFLIB GIFLIB_DEV
+PKGSC_GIFLIB_DEV:= devel
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,GIFLIB,giflib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GIFLIB_DEV,giflib-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_GIFLIB_DEV}))
giflib-install:
$(INSTALL_DIR) $(IDIR_GIFLIB)/usr/lib
$(INSTALL_BIN) $(WRKINST)/usr/lib/libgif.so* \
$(IDIR_GIFLIB)/usr/lib
+giflib-dev-install:
+ ${INSTALL_DIR} ${IDIR_GIFLIB_DEV}/usr/include
+ ${CP} ${WRKINST}/usr/include/*.h ${IDIR_GIFLIB_DEV}/usr/include
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/lm_sensors/Makefile b/package/lm_sensors/Makefile
new file mode 100644
index 000000000..1c9733e3e
--- /dev/null
+++ b/package/lm_sensors/Makefile
@@ -0,0 +1,64 @@
+# 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:= lm_sensors
+PKG_VERSION:= 3.3.1
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 8c0eebda8524fc87da1393b4564d279b
+PKG_DESCR:= linux hw sensor toolset
+PKG_DEPENDS:= sysfsutils
+PKG_SECTION:= misc
+PKG_URL:= http://www.lm-sensors.org
+PKG_SITES:= http://dl.lm-sensors.org/lm-sensors/releases/
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+TARGET_CFLAGS:= ${TARGET_CFLAGS_ARCH} -fwrapv -fno-ident
+
+PKG_SUBPKGS:= LM_SENSORS LM_SENSORS_DEV LM_SENSORS_DETECT
+PKGSD_LM_SENSORS_DEV:= lm_sensors header files
+PKGSC_LM_SENSORS_DEV:= devel
+PKGSD_LM_SENSORS_DETECT:= lm_sensors perl scripts (e.g. sensors-detect)
+PKGSC_LM_SENSORS_DETECT:= misc
+PKGSS_LM_SENSORS_DETECT:= perl
+PKGSB_LM_SENSORS_DETECT:= perl
+
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,LM_SENSORS,lm-sensors,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LM_SENSORS_DEV,lm-sensors-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LM_SENSORS_DEV},${PKGSC_LM_SENSORS_DEV}))
+$(eval $(call PKG_template,LM_SENSORS_DETECT,lm-sensors-detect,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LM_SENSORS_DETECT},${PKGSC_LM_SENSORS_DETECT}))
+
+CONFIG_STYLE:= manual
+
+do-build:
+ ${MAKE} -C ${WRKBUILD} \
+ ${TARGET_CONFIGURE_OPTS} \
+ MACHINE="${CPU_ARCH}" \
+ LINUX="${LINUX_DIR}" \
+ STAGING_DIR="${STAGING_DIR}" \
+ PREFIX="/usr" \
+ user
+
+lm-sensors-install:
+ ${INSTALL_DIR} ${IDIR_LM_SENSORS}/usr/bin
+ ${INSTALL_BIN} ${WRKINST}/usr/local/bin/sensors ${IDIR_LM_SENSORS}/usr/bin/sensors
+ ${INSTALL_DIR} ${IDIR_LM_SENSORS}/usr/lib
+ ${CP} ${WRKINST}/usr/local/lib/libsensors.so* ${IDIR_LM_SENSORS}/usr/lib
+ ${INSTALL_DIR} ${IDIR_LM_SENSORS}/etc
+ ${CP} ${WRKINST}/etc/sensors3.conf ${IDIR_LM_SENSORS}/etc
+
+lm-sensors-dev-install:
+ ${INSTALL_DIR} ${IDIR_LM_SENSORS_DEV}/usr/include/sensors
+ ${CP} ${WRKINST}/usr/local/include/sensors/*.h ${IDIR_LM_SENSORS_DEV}/usr/include/sensors
+
+lm-sensors-detect-install:
+ ${INSTALL_DIR} ${IDIR_LM_SENSORS_DETECT}/usr/sbin
+ ${INSTALL_BIN} ${WRKINST}/usr/local/sbin/fancontrol ${IDIR_LM_SENSORS_DETECT}/usr/sbin/fancontrol
+ ${INSTALL_BIN} ${WRKINST}/usr/local/sbin/isadump ${IDIR_LM_SENSORS_DETECT}/usr/sbin/isadump
+ ${INSTALL_BIN} ${WRKINST}/usr/local/sbin/isaset ${IDIR_LM_SENSORS_DETECT}/usr/sbin/isaset
+ ${INSTALL_BIN} ${WRKINST}/usr/local/sbin/pwmconfig ${IDIR_LM_SENSORS_DETECT}/usr/sbin/pwmconfig
+ ${INSTALL_BIN} ${WRKINST}/usr/local/sbin/sensors-detect ${IDIR_LM_SENSORS_DETECT}/usr/sbin/sensors-detect
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/log4cxx/Makefile b/package/log4cxx/Makefile
new file mode 100644
index 000000000..c65fe0b84
--- /dev/null
+++ b/package/log4cxx/Makefile
@@ -0,0 +1,37 @@
+# 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:= log4cxx
+PKG_VERSION:= 0.10.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= b30ffb8da3665178e68940ff7a61084c
+PKG_DESCR:= Apache logging framework for C++
+PKG_SECTION:= libs
+PKG_DEPENDS:= apr apr-util
+PKG_BUILDDEP:= apr apr-util
+PKG_URL:= http://logging.apache.org/log4cxx/
+PKG_SITES:= http://www.apache.org/dist/logging/log4cxx/0.10.0/
+DISTFILES:= apache-${PKG_NAME}-${PKG_VERSION}.tar.gz
+WRKDIST= ${WRKDIR}/apache-${PKG_NAME}-${PKG_VERSION}
+
+PKG_SUBPKGS:= LOG4CXX LOG4CXX_DEV
+PKGSD_LOG4CXX_DEV:= log4cxx development headers
+PKGSC_LOG4CXX_DEV:= devel
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,LOG4CXX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LOG4CXX_DEV,${PKG_NAME}_dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LOG4CXX_DEV},${PKGSC_LOG4CXX_DEV}))
+
+log4cxx-install:
+ ${INSTALL_DIR} ${IDIR_LOG4CXX}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/*.a ${IDIR_LOG4CXX}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_LOG4CXX}/usr/lib
+
+log4cxx_dev-install:
+ ${INSTALL_DIR} ${IDIR_LOG4CXX_DEV}/usr/include
+ ${CP} ${WRKINST}/usr/include/* ${IDIR_LOG4CXX_DEV}/usr/include
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/log4cxx/patches/patch-src_Makefile_am b/package/log4cxx/patches/patch-src_Makefile_am
new file mode 100644
index 000000000..339a18eeb
--- /dev/null
+++ b/package/log4cxx/patches/patch-src_Makefile_am
@@ -0,0 +1,8 @@
+--- apache-log4cxx-0.10.0.orig/src/Makefile.am 2008-04-01 00:34:52.000000000 +0200
++++ apache-log4cxx-0.10.0/src/Makefile.am 2011-09-08 09:41:19.679507959 +0200
+@@ -13,4 +13,4 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ #
+-SUBDIRS = main examples site test
++SUBDIRS = main
diff --git a/package/log4cxx/patches/patch-src_Makefile_in b/package/log4cxx/patches/patch-src_Makefile_in
new file mode 100644
index 000000000..da14caed3
--- /dev/null
+++ b/package/log4cxx/patches/patch-src_Makefile_in
@@ -0,0 +1,11 @@
+--- apache-log4cxx-0.10.0.orig/src/Makefile.in 2008-04-01 00:44:12.000000000 +0200
++++ apache-log4cxx-0.10.0/src/Makefile.in 2011-09-08 10:16:06.139506556 +0200
+@@ -209,7 +209,7 @@ target_vendor = @target_vendor@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ #
+-SUBDIRS = main examples site test
++SUBDIRS = main
+ all: all-recursive
+
+ .SUFFIXES:
diff --git a/package/log4cxx/patches/patch-src_examples_cpp_console_cpp b/package/log4cxx/patches/patch-src_examples_cpp_console_cpp
new file mode 100644
index 000000000..da948e211
--- /dev/null
+++ b/package/log4cxx/patches/patch-src_examples_cpp_console_cpp
@@ -0,0 +1,11 @@
+--- apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp 2008-04-01 00:34:52.000000000 +0200
++++ apache-log4cxx-0.10.0/src/examples/cpp/console.cpp 2011-09-08 09:33:04.799508250 +0200
+@@ -16,6 +16,8 @@
+ */
+
+ #include <stdlib.h>
++#include <stdio.h>
++#include <string.h>
+ #include <log4cxx/logger.h>
+ #include <log4cxx/consoleappender.h>
+ #include <log4cxx/simplelayout.h>
diff --git a/package/log4cxx/patches/patch-src_main_cpp_inputstreamreader_cpp b/package/log4cxx/patches/patch-src_main_cpp_inputstreamreader_cpp
new file mode 100644
index 000000000..3768a2f6b
--- /dev/null
+++ b/package/log4cxx/patches/patch-src_main_cpp_inputstreamreader_cpp
@@ -0,0 +1,10 @@
+--- apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp 2008-04-01 00:34:09.000000000 +0200
++++ apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp 2011-09-08 09:33:04.799508250 +0200
+@@ -20,6 +20,7 @@
+ #include <log4cxx/helpers/exception.h>
+ #include <log4cxx/helpers/pool.h>
+ #include <log4cxx/helpers/bytebuffer.h>
++#include <string.h>
+
+ using namespace log4cxx;
+ using namespace log4cxx::helpers;
diff --git a/package/log4cxx/patches/patch-src_main_cpp_socketoutputstream_cpp b/package/log4cxx/patches/patch-src_main_cpp_socketoutputstream_cpp
new file mode 100644
index 000000000..bc19643b2
--- /dev/null
+++ b/package/log4cxx/patches/patch-src_main_cpp_socketoutputstream_cpp
@@ -0,0 +1,10 @@
+--- apache-log4cxx-0.10.0.orig/src/main/cpp/socketoutputstream.cpp 2008-04-01 00:34:09.000000000 +0200
++++ apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp 2011-09-08 09:33:04.799508250 +0200
+@@ -19,6 +19,7 @@
+ #include <log4cxx/helpers/socketoutputstream.h>
+ #include <log4cxx/helpers/socket.h>
+ #include <log4cxx/helpers/bytebuffer.h>
++#include <string.h>
+
+ using namespace log4cxx;
+ using namespace log4cxx::helpers;
diff --git a/scripts/dev.cpio b/scripts/dev.cpio
new file mode 100644
index 000000000..de17c7097
--- /dev/null
+++ b/scripts/dev.cpio
Binary files differ