[svn-commits] tzafrir: branch tzafrir/kernelmove_14 r2708 - /team/tzafrir/kernelmove_14/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Jul 9 05:33:07 CDT 2007
Author: tzafrir
Date: Mon Jul 9 05:33:06 2007
New Revision: 2708
URL: http://svn.digium.com/view/zaptel?view=rev&rev=2708
Log:
Install now basically works:
* Moved SELinux test to autoconf.
* removed big obsolete install targets.
Modified:
team/tzafrir/kernelmove_14/Makefile
team/tzafrir/kernelmove_14/TODO
team/tzafrir/kernelmove_14/configure
team/tzafrir/kernelmove_14/configure.ac
team/tzafrir/kernelmove_14/makeopts.in
Modified: team/tzafrir/kernelmove_14/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/Makefile?view=diff&rev=2708&r1=2707&r2=2708
==============================================================================
--- team/tzafrir/kernelmove_14/Makefile (original)
+++ team/tzafrir/kernelmove_14/Makefile Mon Jul 9 05:33:06 2007
@@ -240,6 +240,9 @@
stackcheck: checkstack modules
./checkstack kernel/*.ko */*.ko
+
+README.html: README
+ asciidoc -n -a toc $<
MISDNVERSION=1_1_3
MISDNUSERVERSION=1_1_3
@@ -271,6 +274,7 @@
install: all install-programs install-modules devices
+# FIXME: install kernel/xpp/utils. Or generally utils subdirectories?
install-programs: $(BINS_INSTALL) $(LTZ_A) $(LTZ_SO) firmware
ifeq ($(HOTPLUG_FIRMWARE),yes)
$(MAKE) -C firmware hotplug-install
@@ -286,61 +290,16 @@
$(LDCONFIG) || $(LDCONFIG) -n $(LIB_DIR)
# FIXME: should this be set for the symlink LTZ_SO_BASE or for
# the real file LTZ_SO ?
- if [ -z "$(INSTALL_PREFIX)" ] && $(CHECK_SELINUX) ; then \
+ifneq (0,$(USE_SELINUX))
+ if [ -z "$(DESTDIR)" ]; then \
/sbin/restorecon -v $(LIB_DIR)/$(LTZ_SO_BASE); \
fi
-
-# original install target. Get stuff from here and remove:
-install-obsolete: all devices install-modules install-libs install-include install-xpp
-ifeq ($(HOTPLUG_FIRMWARE),yes)
- $(MAKE) -C firmware hotplug-install
-endif
- if [ -f ztcfg ]; then \
- $(INSTALL) -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg; \
- fi
- if [ -f sethdlc-new ]; then \
- $(INSTALL) -D -m 755 sethdlc-new $(INSTALL_PREFIX)/sbin/sethdlc; \
- elif [ -f sethdlc ]; then \
- $(INSTALL) -D -m 755 sethdlc $(INSTALL_PREFIX)/sbin/sethdlc; \
- fi
- if [ -f zttool ]; then \
- $(INSTALL) -D -m 755 zttool $(INSTALL_PREFIX)/sbin/zttool; \
- fi
- $(INSTALL) -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
- $(INSTALL) -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
- [ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
- [ -f $(CONFIG_FILE) ] || $(INSTALL) -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
- build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel ztdummy xpp zttranscode ztdynamic,$(BUILD_MODULES)) $(MODULE_ALIASES)"
- @if [ -d /etc/modutils ]; then \
- /sbin/update-modules ; \
- fi
-
-install-libs: $(LTZ_SO) $(LTZ_A)
- $(INSTALL) -D -m 755 $(LTZ_A) $(LIB_DIR)/$(LTZ_A)
- $(INSTALL) -D -m 755 $(LTZ_SO) $(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER)
- if [ -z "$(INSTALL_PREFIX)" -a `id -u` = 0 ]; then \
- /sbin/ldconfig || : ;\
- fi
- rm -f $(LIB_DIR)$(LTZ_SO)
- $(LN) -sf $(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) \
- $(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER)
- $(LN) -sf $(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) \
- $(LIB_DIR)/$(LTZ_SO)
- if [ -z "$(INSTALL_PREFIX)" ] && [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then /sbin/restorecon -v $(LIB_DIR)/$(LTZ_SO); fi
+endif
install-xpp:
ifeq (yes,$(BUILD_XPP))
@$(MAKE) -C xpp/utils install
endif
-
-install-include:
- $(INSTALL) -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/zaptel/zaptel.h
- $(INSTALL) -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/zaptel/tonezone.h
- rm -f $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
- rm -f $(INSTALL_PREFIX)/usr/include/linux/torisa.h
- rm -f $(INSTALL_PREFIX)/usr/include/zaptel.h
- rm -f $(INSTALL_PREFIX)/usr/include/torisa.h
- rm -f $(INSTALL_PREFIX)/usr/include/tonezone.h
devices:
ifndef DYNFS
Modified: team/tzafrir/kernelmove_14/TODO
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/TODO?view=diff&rev=2708&r1=2707&r2=2708
==============================================================================
--- team/tzafrir/kernelmove_14/TODO (original)
+++ team/tzafrir/kernelmove_14/TODO Mon Jul 9 05:33:06 2007
@@ -2,12 +2,14 @@
* Basic 2.6 build.
* userspace build.
* Basic 2.4 build.
+* install.
+* install does not install kernel/xpp/utils
* Rename Makefile.kernel26 to Kbuild .
* 2.4 subdirectories includes.
* Test menuselect integration.
* 'make clean' may trigger a configure of menuselect
-* install
+* Check selinux support in configure and install.
* fix building of datamods
* properly clean all programs
* uninstall target
Modified: team/tzafrir/kernelmove_14/configure
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/configure?view=diff&rev=2708&r1=2707&r2=2708
==============================================================================
--- team/tzafrir/kernelmove_14/configure (original)
+++ team/tzafrir/kernelmove_14/configure Mon Jul 9 05:33:06 2007
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 2651 .
+# From configure.ac Revision: 2691 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61.
#
@@ -686,6 +686,7 @@
USB_LIB
USB_INCLUDE
PBX_LIBUSB
+USE_SELINUX
LIBOBJS
LTLIBOBJS'
ac_subst_files=''
@@ -1270,6 +1271,7 @@
--with-ncurses=PATH use ncurses files in PATH
--with-newt=PATH use newt files in PATH
--with-usb=PATH use libusb files in PATH
+ --with-selinux enable (with) / disable (without) SELinux
Some influential environment variables:
CC C compiler command
@@ -5321,6 +5323,23 @@
fi
fi
+
+
+
+
+
+# Check whether --with-selinux was given.
+if test "${with_selinux+set}" = set; then
+ withval=$with_selinux; USE_SELINUX=$withval
+else
+ if test ! -x /usr/sbin/sestatus; then
+ USE_SELINUX=0;
+ elif /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"; then
+ USE_SELINUX=1
+ fi
+
+
+fi
@@ -6026,11 +6045,12 @@
USB_LIB!$USB_LIB$ac_delim
USB_INCLUDE!$USB_INCLUDE$ac_delim
PBX_LIBUSB!$PBX_LIBUSB$ac_delim
+USE_SELINUX!$USE_SELINUX$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 71; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 72; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Modified: team/tzafrir/kernelmove_14/configure.ac
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/configure.ac?view=diff&rev=2708&r1=2707&r2=2708
==============================================================================
--- team/tzafrir/kernelmove_14/configure.ac (original)
+++ team/tzafrir/kernelmove_14/configure.ac Mon Jul 9 05:33:06 2007
@@ -60,6 +60,20 @@
AST_EXT_LIB([newt], [newtBell], [newt.h], [NEWT], [newt])
AST_EXT_LIB([usb], [usb_init], [usb.h], [USB], [libusb])
+AC_ARG_WITH(selinux,
+ [AS_HELP_STRING([--with-selinux],
+ [enable (with) / disable (without) SELinux])],
+ [USE_SELINUX=$withval],
+ [ if test ! -x /usr/sbin/sestatus; then
+ USE_SELINUX=0;
+ elif /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"; then
+ USE_SELINUX=1
+ fi
+ ]
+)
+
+
+AC_SUBST(USE_SELINUX)
AC_CONFIG_FILES([build_tools/menuselect-deps makeopts])
AC_OUTPUT
Modified: team/tzafrir/kernelmove_14/makeopts.in
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/makeopts.in?view=diff&rev=2708&r1=2707&r2=2708
==============================================================================
--- team/tzafrir/kernelmove_14/makeopts.in (original)
+++ team/tzafrir/kernelmove_14/makeopts.in Mon Jul 9 05:33:06 2007
@@ -37,3 +37,4 @@
USB_LIB=@NCURSES_LIB@
USB_INCLUDE=@USB_INCLUDE@
+USE_SELINUX=@USE_SELINUX@
More information about the svn-commits
mailing list