[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-225-g108bf41
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-225-g108bf41
|
From: Julien B a. A. <ar...@us...> - 2013-04-15 13:42:59
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 108bf417b34f2057a61aa9d156fc94f066f8cb77 (commit)
from e8bd09f664b1afa253a2941fe2bf62e979cf1886 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 108bf417b34f2057a61aa9d156fc94f066f8cb77
Author: Julien Boibessot <jul...@ar...>
Date: Mon Apr 15 15:42:32 2013 +0200
[BUILDROOT] 2012.02: Add opkg package manager (BR mainline backport)
-----------------------------------------------------------------------
Summary of changes:
.../204-armadeus-add_opkg_package_backport.patch | 191 ++++++++++++++++++++
patches/buildroot/2012.02/cleanup_buildroot.sh | 1 +
2 files changed, 192 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2012.02/204-armadeus-add_opkg_package_backport.patch
diff --git a/patches/buildroot/2012.02/204-armadeus-add_opkg_package_backport.patch b/patches/buildroot/2012.02/204-armadeus-add_opkg_package_backport.patch
new file mode 100644
index 0000000..1c8c640
--- /dev/null
+++ b/patches/buildroot/2012.02/204-armadeus-add_opkg_package_backport.patch
@@ -0,0 +1,191 @@
+Backport from Buildroot mainline, to have opkg until we move to 2013.xx
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2013-04-15 15:30:55.000000000 +0200
++++ buildroot/package/Config.in 2013-04-15 15:31:52.000000000 +0200
+@@ -574,6 +574,7 @@
+
+ menu "Package managers"
+ source "package/ipkg/Config.in"
++source "package/opkg/Config.in"
+ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+ source "package/rpm/Config.in"
+ endif
+Index: buildroot/package/opkg/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/opkg/Config.in 2013-04-15 15:32:34.000000000 +0200
+@@ -0,0 +1,13 @@
++config BR2_PACKAGE_OPKG
++ bool "opkg"
++ help
++ Opkg is a lightweight package management system, based on ipkg. It is
++ written in C and resembles apt/dpkg in operation. It is intended for
++ use on embedded Linux devices.
++ Opkg is maintained, stable, robust and conservative in its memory
++ usage, despite its buggy ipkg ancestry. As best it can, opkg
++ maintains backwards compatibility with ipkg and conforms to a subset
++ of debian's policy manual regarding control files.
++
++ http://code.google.com/p/opkg/
++
+Index: buildroot/package/opkg/opkg.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/opkg/opkg.mk 2013-04-15 15:40:19.000000000 +0200
+@@ -0,0 +1,22 @@
++#############################################################
++#
++# opkg
++#
++#############################################################
++
++OPKG_VERSION = 635
++OPKG_SOURCE = opkg-$(OPKG_VERSION).tar.gz
++OPKG_SITE = http://opkg.googlecode.com/svn/trunk/
++OPKG_SITE_METHOD = svn
++OPKG_INSTALL_STAGING = YES
++OPKG_CONF_OPT = --disable-curl --disable-gpg
++OPKG_AUTORECONF = YES
++
++# Ensure directory for lockfile exists
++define OPKG_CREATE_LOCKDIR
++ mkdir -p $(TARGET_DIR)/usr/lib/opkg
++endef
++
++OPKG_POST_INSTALL_TARGET_HOOKS += OPKG_CREATE_LOCKDIR
++
++$(eval $(call AUTOTARGETS))
+Index: buildroot/package/opkg/opkg-build
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/opkg/opkg-build 2013-04-15 15:33:13.000000000 +0200
+@@ -0,0 +1,127 @@
++#!/bin/sh
++
++# opkg-build -- construct a .opk from a directory
++# Carl Worth <cw...@ea...>
++# based on a script by Steve Redler IV, st...@sr... 5-21-2001
++set -e
++
++opkg_extract_value() {
++ sed -e "s/^[^:]*:[[:space:]]*//"
++}
++
++required_field() {
++ field=$1
++
++ value=`grep "^$field:" < $CONTROL/control | opkg_extract_value`
++ if [ -z "$value" ]; then
++ echo "opkg-build: Error: $CONTROL/control is missing field $field" ;
++ PKG_ERROR=1
++ fi
++ echo $value
++}
++
++pkg_appears_sane() {
++ local pkg_dir=$1
++
++ local owd=`pwd`
++ cd $pkg_dir
++
++ PKG_ERROR=0
++ if [ ! -f "$CONTROL/control" ]; then
++ echo "opkg-build: Error: Control file $pkg_dir/$CONTROL/control not found."
++ cd $owd
++ return 1
++ fi
++
++ pkg=`required_field Package`
++ version=`required_field Version`
++ arch=`required_field Architecture`
++ required_field Maintainer >/dev/null
++ required_field Description >/dev/null
++
++ if echo $pkg | grep '[^a-z0-9.+-]'; then
++ echo "opkg-build: Error: Package name $name contains illegal characters, (other than [a-z0-9.+-])"
++ PKG_ERROR=1;
++ fi
++
++ local bad_fields=`sed -ne 's/^\([^[:space:]][^:[:space:]]\+[[:space:]]\+\)[^:].*/\1/p' < $CONTROL/control | sed -e 's/\\n//'`
++ if [ -n "$bad_fields" ]; then
++ bad_fields=`echo $bad_fields`
++ echo "opkg-build: Error: The following fields in $CONTROL/control are missing a ':'"
++ echo " $bad_fields"
++ echo "opkg-build: This may be due to a missing initial space for a multi-line field value"
++ PKG_ERROR=1
++ fi
++
++ for script in $CONTROL/preinst $CONTROL/postinst $CONTROL/prerm $CONTROL/postrm; do
++ if [ -f $script -a ! -x $script ]; then
++ echo "opkg-build: Error: package script $script is not executable"
++ PKG_ERROR=1
++ fi
++ done
++
++ if [ -f $CONTROL/conffiles ]; then
++ for cf in `cat $CONTROL/conffiles`; do
++ if [ ! -f ./$cf ]; then
++ echo "opkg-build: Error: $CONTROL/conffiles mentions conffile $cf which does not exist"
++ PKG_ERROR=1
++ fi
++ done
++ fi
++
++ cd $owd
++ return $PKG_ERROR
++}
++
++###
++# opkg-build "main"
++###
++
++case $# in
++1)
++ dest_dir=.
++ ;;
++2)
++ dest_dir=$2
++ ;;
++*)
++ echo "Usage: opkg-build <pkg_directory> [<destination_directory>]" ;
++ exit 1
++ ;;
++esac
++
++pkg_dir=$1
++
++if [ ! -d $pkg_dir ]; then
++ echo "opkg-build: Error: Directory $pkg_dir does not exist"
++ exit 1
++fi
++
++# CONTROL is second so that it takes precedence
++CONTROL=
++[ -d $pkg_dir/DEBIAN ] && CONTROL=DEBIAN
++[ -d $pkg_dir/CONTROL ] && CONTROL=CONTROL
++if [ -z "$CONTROL" ]; then
++ echo "opkg-build: Error: Directory $pkg_dir has no CONTROL subdirectory."
++ exit 1
++fi
++
++if ! pkg_appears_sane $pkg_dir; then
++ echo "Please fix the above errors and try again."
++ exit 1
++fi
++
++tmp_dir=$dest_dir/OPKG_BUILD.$$
++mkdir $tmp_dir
++
++tar -C $pkg_dir -czf $tmp_dir/data.tar.gz . --exclude=$CONTROL
++tar -C $pkg_dir/$CONTROL -czf $tmp_dir/control.tar.gz .
++
++echo "2.0" > $tmp_dir/debian-binary
++
++pkg_file=$dest_dir/${pkg}_${version}_${arch}.opk
++tar -C $tmp_dir -czf $pkg_file debian-binary data.tar.gz control.tar.gz
++rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz
++rmdir $tmp_dir
++
++echo "Packaged contents of $pkg_dir into $pkg_file"
diff --git a/patches/buildroot/2012.02/cleanup_buildroot.sh b/patches/buildroot/2012.02/cleanup_buildroot.sh
index 2bb7241..614ce35 100755
--- a/patches/buildroot/2012.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2012.02/cleanup_buildroot.sh
@@ -84,3 +84,4 @@ rm -f buildroot/package/qt/qt-4.7.4-map_keyboard_keys_metas_and_menu.patch
rm -rf buildroot/package/gnokii/
rm -f buildroot/linux/linux.mk
rm -rf buildroot/package/smstools3/
+rm -rf buildroot/package/opkg/
hooks/post-receive
--
armadeus
|
