--- /dev/null
+juho son <juho80.son at samsung dot com>
+Suchang Woo <suchang.woo at samsung dot com>
+kyungmin Park <kyungmin Park at samsung dot com>
- Copyright (c) 2005-2008, The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
END OF TERMS AND CONDITIONS
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+
-Copyright (c) 2007 The Android Open Source Project
+Copyright (c) The Android Open Source Project
+Copyright (c) Samsung Electronics Co., Ltd. All rights reserved.
+Except as noted, this software is licensed under Apache License, Version 2.
+Please, see the LICENSE.APLv2 file for Apache License terms and conditions.
+++ /dev/null
-#!/bin/sh
-
-### WARNING: DO NOT CHANGE CODES from HERE !!! ###
-#import setup
-cd `dirname $0`
-_PWD=`pwd`
-pushd ./ > /dev/null
-while [ ! -f "./xo-setup.conf" ]
-do
- cd ../
- SRCROOT=`pwd`
- if [ "$SRCROOT" == "/" ]; then
- echo "Cannot find xo-setup.conf !!"
- exit 1
- fi
-done
-popd > /dev/null
-. ${SRCROOT}/xo-setup.conf
-cd ${_PWD}
-### WARNING: DO NOT CHANGE CODES until HERE!!! ###
-
-CFLAGS="${CFLAGS}"
-export VERSION=1.0
-
-if [ "$MACHINE" == "volans" ]; then
- #export DEVELOP_VER=yes
- CFLAGS="${CFLAGS} -D__VOLANS"
-fi
-
-
-if [ $1 ];
-then
- run make $1 || exit 1
-else
- mkdir -p /opt/etc/
-# mkdir -p /opt/data/.debug/symbol/
- if [ -z "$USE_AUTOGEN" ]; then
- run ./autogen.sh || exit 1
- run ./configure --prefix=$PREFIX || exit 1
- fi
- run make || exit 1
- run make install || exit 1
- mkdir -p ${PREFIX}/bin/
- if [ "$DISTRO" = "vodafone-sdk" ]; then
- make_pkg_option="{make_pkg_option} --postjob=./make_openapi.sh"
- fi
- run make_pkg.sh ${make_pkg_option} || exit 1
-fi
-
# Checks for programs.
dnl AC_PROG_CXX
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
AC_PROG_CC
AC_PROG_GCC_TRADITIONAL
AC_PROG_LIBTOOL
+++ /dev/null
-dlog (0.4.1-0) unstable; urgency=low
-
- * change version
- * Git: pkgs/d/dlog
- * Tag: dlog_0.4.1-0
-
- -- Jeesun Kim <iamjs.kim@samsung.com> Sat, 10 Dec 2011 09:26:45 +0900
-
-dlog (0.1.0-0) unstable; urgency=low
-
- * Initial Release.
- * Git: pkgs/d/dlog
- * Tag: dlog_0.1.0-0
-
- -- Jeesun Kim <iamjs.kim@samsung.com> Sat, 10 Dec 2011 09:26:45 +0900
+++ /dev/null
-Source: dlog
-Section: devel
-Priority: extra
-Maintainer: Youngjoo Park <yjoo93.park@samsung.com>
-Uploaders: Youmin Ha <youmin.ha@samsung.com>, Noha Park <noha.park@samsung.com>, Youngkyeong Yun <yk.yun@samsung.com>
-Build-Depends: debhelper (>= 5), autotools-dev
-Standards-Version: 0.1.0
-
-Package: dlog-dev
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libdlog-0
-Description: dlog API library (Development)
-XB-Generate-Docs: yes
-
-Package: libdlog-0
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: logging library (shared object)
-
-Package: dlogutil-bin
-Section: devel
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: print log data to the screen
-
-Package: dlog-0-dbg
-Section: debug
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libdlog-0, dlogutil-bin
-Description: logging library, dlogutil dbg package (unstripped)
+++ /dev/null
-Copyright (c) 2007 The Android Open Source Project
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the Apache License version 2.0.
-
-The full text of the Apache 2.0 can be found in
-/usr/share/common-licenses.
-
+++ /dev/null
-usr/bin
-usr/sbin
+++ /dev/null
-@PREFIX@/include/dlog/dlog.h
-@PREFIX@/lib/libdlog.la
-@PREFIX@/lib/pkgconfig/*.pc
-
+++ /dev/null
-@PREFIX@/bin/dlogutil
-/etc/rc.d/init.d/dlog.sh
+++ /dev/null
-#!/bin/sh
-#Add boot sequence script
-rm -f /etc/rc.d/rc3.d/S05dlog /etc/rc.d/rc5.d/S05dlog
-ln -s /etc/rc.d/init.d/dlog.sh /etc/rc.d/rc3.d/S05dlog
-ln -s /etc/rc.d/init.d/dlog.sh /etc/rc.d/rc5.d/S05dlog
+++ /dev/null
-@PREFIX@/lib/libdlog.so*
+++ /dev/null
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_GNU_OS)
-
-CFLAGS ?= -Wall -g
-LDFLAGS ?=
-PREFIX ?= /usr
-DATADIR ?= /opt
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-# architecture is not arm
-ifneq (, $(findstring arm, $(DEB_HOST_ARCH)))
- # do something here
-else
- # do something here for arm architecture
-endif
-
-LDFLAGS += -Wl,--rpath=$(PREFIX)/lib -Wl,--as-needed -Wl,--no-undefined
-
-#preconfig:
-# autoconf
-# automake
-
-config.status: configure.ac Makefile.am
- dh_testdir
- # Add here commands to configure the package.
- ./autogen.sh
- CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --prefix=$(PREFIX)
-
-build: build-stamp
-
-build-stamp: config.status
- dh_testdir
- touch build-stamp
-
- # Add here commands to compile the package.
- $(MAKE)
- #docbook-to-man debian/ncurses.sgml > ncurses.1
-
- for f in `find $(CURDIR)/debian/ -name "*.in"`; do \
- cat $$f > $${f%.in}; \
- sed -i -e "s#@PREFIX@#$(PREFIX)#g" $${f%.in}; \
- sed -i -e "s#@DATADIR@#$(DATADIR)#g" $${f%.in}; \
- done
-
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- -$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
- for f in `find $(CURDIR)/debian/ -name "*.in"`; do \
- rm -f $${f%.in}; \
- done
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/ncurses.
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_install --list-missing --sourcedir=debian/tmp
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_python
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
-# dh_strip
- dh_strip --dbg-package=dlog-0-dbg
- dh_compress
- dh_fixperms
-# dh_perl
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
/*
- * Copyright (C) 2005 The Android Open Source Project
+ * DLOG
+ * Copyright (c) 2005-2008, The Android Open Source Project
+ * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
-/* utils/logger.h
-**
-** Copyright 2007, The Android Open Source Project
-**
-** This file is dual licensed. It may be redistributed and/or modified
-** under the terms of the Apache 2.0 License OR version 2 of the GNU
-** General Public License.
-*/
+/*
+ * DLOG
+ * Copyright (c) 2005-2008, The Android Open Source Project
+ * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
#ifndef _UTILS_LOGGER_H
#define _UTILS_LOGGER_H
/*
- * Copyright (C) 2006 The Android Open Source Project
+ * DLOG
+ * Copyright (c) 2005-2008, The Android Open Source Project
+ * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
/*
- * Copyright (C) 2007 The Android Open Source Project
+ * DLOG
+ * Copyright (c) 2005-2008, The Android Open Source Project
+ * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
/*
- * Copyright 2006, The Android Open Source Project
+ * DLOG
+ * Copyright (c) 2005-2008, The Android Open Source Project
+ * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
/**
- * Splits a wire-format buffer into an AndroidLogEntry
+ * Splits a wire-format buffer into an LogEntry
* entry allocated by caller. Pointers will point directly into buf
*
* Returns 0 on success and -1 on invalid wire format (entry will be
/*
- * Copyright (C) 2007 The Android Open Source Project
+ * Copyright (c) 2005-2008, The Android Open Source Project
+ * Copyright (c) 2009-2013, Samsung Electronics Co., Ltd. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
exit(EXIT_FAILURE);
}
else if (!ret) {
+ free(entry);
fprintf(stderr, "read: Unexpected EOF!\n");
exit(EXIT_FAILURE);
}
-
+ else if (entry->entry.len != ret - sizeof(struct logger_entry)) {
+ free(entry);
+ fprintf(stderr, "read: unexpected length. Expected %d, got %d\n",
+ entry->entry.len, ret - sizeof(struct logger_entry));
+ exit(EXIT_FAILURE);
+ }
entry->entry.msg[entry->entry.len] = '\0';
enqueue(dev, entry);
}
dev = log_devices_new(buf);
- if (devices) {
- if (log_devices_add_to_tail(devices, dev)) {
- fprintf(stderr, "Open log device %s failed\n", buf);
- exit(-1);
- }
- } else {
- devices = dev;
- g_dev_count = 1;
- }
- }
+ if (dev == NULL) {
+ fprintf(stderr,"Can't add log device: %s\n", buf);
+ exit(-1);
+ }
+ if (devices) {
+ if (log_devices_add_to_tail(devices, dev)) {
+ fprintf(stderr, "Open log device %s failed\n", buf);
+ exit(-1);
+ }
+ } else {
+ devices = dev;
+ g_dev_count = 1;
+ }
+ }
break;
case 'f':
+* Thu Jan 03 2013 Anas Nashif <anas.nashif@intel.com> accepted/trunk/20121212.102709@5168da3
+- fixed build with new compilers
+- spec cleanup
+- check for archiver in configure.ac
+
* Thu Jun 28 2012 Patrick McCarty <patrick.mccarty@linux.intel.com> - 0.4.1
- Fix initscript symlinks
Version: 0.4.1
Release: 2
Group: System/Libraries
-License: Apache License
+License: Apache License, Version 2.0
Source0: %{name}-%{version}.tar.gz
-Source101: packaging/dlog-main.service
-Source102: packaging/dlog-radio.service
-Source103: packaging/tizen-debug-level.service
+Source101: dlog-main.service
+Source102: dlog-radio.service
+Source103: tizen-debug-level.service
BuildRequires: pkgconfig(libsystemd-journal)
-Requires(post): /sbin/ldconfig
-Requires(post): /usr/bin/systemctl
Requires(post): /usr/bin/vconftool
Requires(post): coreutils
-Requires(postun): /sbin/ldconfig
-Requires(postun): /usr/bin/systemctl
-Requires(preun): /usr/bin/systemctl
%description
dlog API library
Summary: print log data to the screen
Group: Development/Libraries
Requires: lib%{name} = %{version}-%{release}
-Requires(post): /bin/rm, /bin/ln
+Requires(post): /usr/bin/systemctl
+Requires(postun): /usr/bin/systemctl
+Requires(preun): /usr/bin/systemctl
%description -n dlogutil
-utilities for print log data
+Utilities for print log data
ln -s ../tizen-debug-level.service %{buildroot}%{_libdir}/systemd/system/basic.target.wants/tizen-debug-level.service
mkdir -p %{buildroot}/usr/share/license
-cp LICENSE %{buildroot}/usr/share/license/%{name}
+cp LICENSE.APLv2 %{buildroot}/usr/share/license/%{name}
+mkdir -p %{buildroot}/opt/etc/dlog
%preun -n dlogutil
if [ $1 == 0 ]; then
fi
%post -n dlogutil
-mkdir -p /opt/etc/dlog
-chown 0:5000 /opt/etc/dlog
-chmod 775 /opt/etc/dlog
-chmod 755 /usr/bin/dlogctrl
systemctl daemon-reload
if [ $1 == 1 ]; then
systemctl restart dlog-main.service
%postun -n dlogutil
systemctl daemon-reload
-%post -n libdlog
-/sbin/ldconfig
-%postun -n libdlog
-/sbin/ldconfig
+%post -n libdlog -p /sbin/ldconfig
+%postun -n libdlog -p /sbin/ldconfig
%files -n dlogutil
%manifest dlogutil.manifest
%{_bindir}/dlogutil
-%{_bindir}/dlogctrl
+%attr(775,root,root) %{_bindir}/dlogctrl
%{_sysconfdir}/rc.d/init.d/dlog.sh
%{_sysconfdir}/rc.d/rc3.d/S05dlog
%{_sysconfdir}/rc.d/rc5.d/S05dlog
%{_libdir}/systemd/system/basic.target.wants/tizen-debug-level.service
%{_libdir}/systemd/system/multi-user.target.wants/dlog-main.service
%{_libdir}/systemd/system/multi-user.target.wants/dlog-radio.service
+%attr(775,root,app) %dir /opt/etc/dlog
%files -n libdlog
/usr/share/license/%{name}
-%doc LICENSE
+%doc LICENSE.APLv2
/opt/etc/.dloglevel
/etc/profile.d/tizen_platform_env.sh
%{_libdir}/libdlog.so.0
projects / framework / system / dlog.git / commitdiff