Browse Source

* merged r21428 from kernel-cleanup2

* updated misdn (2006-08-30 -> 1.1.4)


git-svn-id: svn://svn.opensde.net/opensde/package/trunk@21659 10447126-35f2-4685-b0cf-6dd780d3921f
early
Alejandro Mery 17 years ago
parent
commit
a9406e8644
5 changed files with 10 additions and 111 deletions
  1. +0
    -53
      network/misdn/mISDN-split-install-init.patch
  2. +2
    -13
      network/misdn/misdn.conf
  3. +8
    -6
      network/misdn/misdn.desc
  4. +0
    -15
      network/misdn/pkg_linux26_pre.conf
  5. +0
    -24
      network/misdn/postlinux.conf

+ 0
- 53
network/misdn/mISDN-split-install-init.patch

@ -1,53 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../misdn/mISDN-split-install-init.patch
# Copyright (C) 2006 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
mISDN-split-install-init.patch
This patch splits the installation of the init script
from the install target to it's own.
2006-08-31 Christian Wiese <cw@ixplanet.de>
--- ./Makefile.orig 2006-08-31 15:11:04.000000000 +0200
+++ ./Makefile 2006-08-31 15:14:23.000000000 +0200
@@ -53,12 +53,6 @@
cd $(LINUX) ; make INSTALL_MOD_PATH=$(INSTALL_PREFIX) SUBDIRS=$(MISDN_SRC) modules_install
mkdir -p $(INSTALL_PREFIX)/usr/include/linux/
cp $(MISDNDIR)/include/linux/*.h $(INSTALL_PREFIX)/usr/include/linux/
- mkdir -p $(INSTALL_PREFIX)/usr/sbin/
- install -m755 misdn-init $(INSTALL_PREFIX)/usr/sbin/
- if [ -d $(INSTALL_PREFIX)/etc/init.d ]; then \
- if [ -e $(INSTALL_PREFIX)/etc/init.d/misdn-init ]; then rm -rf $(INSTALL_PREFIX)/etc/init.d/misdn-init; fi; \
- ln -s $(INSTALL_PREFIX)/usr/sbin/misdn-init $(INSTALL_PREFIX)/etc/init.d/misdn-init; \
- fi
mkdir -p $(INSTALL_PREFIX)/etc/modprobe.d
cp mISDN.modprobe.d $(INSTALL_PREFIX)/etc/modprobe.d/mISDN
mkdir -p $(INSTALL_PREFIX)/etc/modules.d
@@ -67,6 +61,14 @@
$(UPDATE_MODULES)
$(MODULES_UPDATE)
+install-init:
+ mkdir -p $(INSTALL_PREFIX)/usr/sbin/
+ install -m755 misdn-init $(INSTALL_PREFIX)/usr/sbin/
+ if [ -d $(INSTALL_PREFIX)/etc/init.d ]; then \
+ if [ -e $(INSTALL_PREFIX)/etc/init.d/misdn-init ]; then rm -rf $(INSTALL_PREFIX)/etc/init.d/misdn-init; fi; \
+ ln -s $(INSTALL_PREFIX)/usr/sbin/misdn-init $(INSTALL_PREFIX)/etc/init.d/misdn-init; \
+ fi
+
test_old_misdn:
@if echo -ne "#include <linux/mISDNif.h>" | gcc -C -E - 2>/dev/null 1>/dev/null ; then \
if ! echo -ne "#include <linux/mISDNif.h>\n#if MISDN_MAJOR_VERSION < 4\n#error old mISDNif.h\n#endif\n" | gcc -C -E - 2>/dev/null 1>/dev/null ; then \

+ 2
- 13
network/misdn/misdn.conf

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../misdn/misdn.conf
# Copyright (C) 2006 The OpenSDE Project
# Copyright (C) 2007 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
@ -12,15 +12,4 @@
# GNU General Public License can be found in the file COPYING.
# --- SDE-COPYRIGHT-NOTE-END ---
misdnuser_src=`match_source_file -p misdnuser-${ver}`
misdnuser_preconf() {
# unpack mISDNuser source tar
tar -C $builddir $taropt $misdnuser_src
cd $builddir/mISDNuser
var_append makeopt " " "MISDNDIR=$builddir/mISDN"
var_append makeopt " " "MISDN_DIR=$builddir/mISDNuser"
var_append makeinstopt " " "INSTALL_PREFIX=$root"
}
hook_add preconf 5 "misdnuser_preconf"
var_append makeinstopt ' ' DEPMOD=true

+ 8
- 6
network/misdn/misdn.desc

@ -2,7 +2,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY] Filename: package/.../misdn/misdn.desc
[COPY] Copyright (C) 2006 The OpenSDE Project
[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project
[COPY]
[COPY] More information can be found in the files COPYING and README.
[COPY]
@ -18,18 +18,20 @@
[T] This package provides the 3rd. party kernel modules as well as the needed
[T] userspace tools, libraries and headers.
[U] http://www.isdn4linux.de/mISDN/
[U] http://www.misdn.org/index.php/Main_Page
[A] The ISDN4Linux Project
[M] Christian Wiese <cw@ixplanet.de>
[C] extra/tool
[F] NOPARALLEL
[L] GPL
[S] Alpha
[V] 2006-08-30
[S] Stable
[V] 1.1.4
[P] X -----5---9 250.000
[D] X misdn-2006-08-30.tar.bz2 cvs://:pserver:anonymous:readonly@cvs.isdn4linux.de:/i4ldev mISDN -D 2006-08-30
[D] X misdnuser-2006-08-30.tar.bz2 cvs://:pserver:anonymous:readonly@cvs.isdn4linux.de:/i4ldev mISDNuser -D 2006-08-30
[SRC] .
[D] 3176235108 mISDN-1_1_4.tar.gz http://www.misdn.org/downloads/releases/
[D] 2267662607 mISDNuser-1_1_4.tar.gz http://www.misdn.org/downloads/releases/

+ 0
- 15
network/misdn/pkg_linux26_pre.conf

@ -1,15 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../misdn/pkg_linux26_pre.conf
# Copyright (C) 2006 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING.
# --- SDE-COPYRIGHT-NOTE-END ---
var_append lx_3rd_party_modules " " "misdn"

+ 0
- 24
network/misdn/postlinux.conf

@ -1,24 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../misdn/postlinux.conf
# Copyright (C) 2006 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING.
# --- SDE-COPYRIGHT-NOTE-END ---
var_append makeopt " " "CC=$KCC"
var_append makeopt " " "INSTALL_PREFIX=$root"
var_append makeopt " " "MODS=$moduledir"
var_append makeinstopt " " "INSTALL_PREFIX=$root"
var_append makeinstopt " " "MODS=$moduledir"
# avoid to run depmod
var_append makeinstopt " " "DEPMOD=true"

Loading…
Cancel
Save