From 0471b0c702db2c6872d4432c3714df0f06da49ec Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Sun, 15 May 2005 10:39:44 +0000 Subject: [PATCH] Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/05/15 11:11:36+02:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/05/14 23:54:59+02:00 uni-frankfurt.de!mickeyl add module-init-tools 3.2-pre4 - this one is needed to get the new in kernel PCMCIA control working. can someone check if the soc patch is still necessary? 2005/05/14 23:53:20+02:00 uni-frankfurt.de!mickeyl screen -> nonworking. needs lots of patches to compile against recent userland headers BKrev: 428726f0ZE6CnZMxsDxjonzJhtkWgg --- .../module-init-tools_3.2-pre4.bb} | 0 .../screen/screen-3.9.15}/configure.patch | 0 .../screen/screen-4.0.1}/configure.patch | 0 .../screen/screen-4.0.2/configure.patch | 0 packages/nonworking/screen/screen_3.9.15.bb | 0 packages/nonworking/screen/screen_4.0.1.bb | 0 packages/nonworking/screen/screen_4.0.2.bb | 0 packages/screen/screen_3.9.15.bb | 18 ------------------ packages/screen/screen_4.0.1.bb | 18 ------------------ packages/screen/screen_4.0.2.bb | 18 ------------------ 10 files changed, 54 deletions(-) rename packages/{screen/screen-3.9.15/configure.patch => module-init-tools/module-init-tools_3.2-pre4.bb} (100%) rename packages/{screen/screen-4.0.1 => nonworking/screen/screen-3.9.15}/configure.patch (100%) rename packages/{screen/screen-4.0.2 => nonworking/screen/screen-4.0.1}/configure.patch (100%) create mode 100644 packages/nonworking/screen/screen-4.0.2/configure.patch create mode 100644 packages/nonworking/screen/screen_3.9.15.bb create mode 100644 packages/nonworking/screen/screen_4.0.1.bb create mode 100644 packages/nonworking/screen/screen_4.0.2.bb delete mode 100644 packages/screen/screen_3.9.15.bb delete mode 100644 packages/screen/screen_4.0.1.bb delete mode 100644 packages/screen/screen_4.0.2.bb diff --git a/packages/screen/screen-3.9.15/configure.patch b/packages/module-init-tools/module-init-tools_3.2-pre4.bb similarity index 100% rename from packages/screen/screen-3.9.15/configure.patch rename to packages/module-init-tools/module-init-tools_3.2-pre4.bb diff --git a/packages/screen/screen-4.0.1/configure.patch b/packages/nonworking/screen/screen-3.9.15/configure.patch similarity index 100% rename from packages/screen/screen-4.0.1/configure.patch rename to packages/nonworking/screen/screen-3.9.15/configure.patch diff --git a/packages/screen/screen-4.0.2/configure.patch b/packages/nonworking/screen/screen-4.0.1/configure.patch similarity index 100% rename from packages/screen/screen-4.0.2/configure.patch rename to packages/nonworking/screen/screen-4.0.1/configure.patch diff --git a/packages/nonworking/screen/screen-4.0.2/configure.patch b/packages/nonworking/screen/screen-4.0.2/configure.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/nonworking/screen/screen_3.9.15.bb b/packages/nonworking/screen/screen_3.9.15.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/nonworking/screen/screen_4.0.1.bb b/packages/nonworking/screen/screen_4.0.1.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/nonworking/screen/screen_4.0.2.bb b/packages/nonworking/screen/screen_4.0.2.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/screen/screen_3.9.15.bb b/packages/screen/screen_3.9.15.bb deleted file mode 100644 index 42a5c7acb4..0000000000 --- a/packages/screen/screen_3.9.15.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "console/utils" -DEPENDS = "ncurses" -DESCRIPTION = "Screen is a full-screen window manager \ -that multiplexes a physical terminal between several \ -processes, typically interactive shells." -LICENSE = "GPL" -SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \ - file://configure.patch;patch=1" - -inherit autotools - -EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 --disable-pam" - -do_configure_prepend () { - for f in comm.h kmapdef.c term.h tty.c; do - cp ${S}/$f.dist ${S}/$f - done -} diff --git a/packages/screen/screen_4.0.1.bb b/packages/screen/screen_4.0.1.bb deleted file mode 100644 index c2cd758dde..0000000000 --- a/packages/screen/screen_4.0.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "console/utils" -DEPENDS = "ncurses" -DESCRIPTION = "Screen is a full-screen window manager \ -that multiplexes a physical terminal between several \ -processes, typically interactive shells." -LICENSE = "GPL" -SRC_URI = "ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-${PV}.tar.gz \ - file://configure.patch;patch=1" - -inherit autotools - -EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 --disable-pam" - -do_configure_prepend () { - for f in comm.h kmapdef.c term.h tty.c; do - cp ${S}/$f.dist ${S}/$f - done -} diff --git a/packages/screen/screen_4.0.2.bb b/packages/screen/screen_4.0.2.bb deleted file mode 100644 index c2cd758dde..0000000000 --- a/packages/screen/screen_4.0.2.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "console/utils" -DEPENDS = "ncurses" -DESCRIPTION = "Screen is a full-screen window manager \ -that multiplexes a physical terminal between several \ -processes, typically interactive shells." -LICENSE = "GPL" -SRC_URI = "ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-${PV}.tar.gz \ - file://configure.patch;patch=1" - -inherit autotools - -EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 --disable-pam" - -do_configure_prepend () { - for f in comm.h kmapdef.c term.h tty.c; do - cp ${S}/$f.dist ${S}/$f - done -} -- 2.39.5