summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/angstrom/angstrom-x11-base-depends.bb3
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.21/defconfig2
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.21.6.bb2
-rw-r--r--packages/pkgconfig/pkgconfig-native_0.22.bb4
-rw-r--r--packages/tasks/task-slugos.bb5
-rw-r--r--packages/xorg-lib/libx11_1.1.1.bb15
-rw-r--r--packages/xorg-lib/libx11_1.1.2.bb12
-rw-r--r--packages/xorg-lib/libx11_git.bb16
8 files changed, 34 insertions, 25 deletions
diff --git a/packages/angstrom/angstrom-x11-base-depends.bb b/packages/angstrom/angstrom-x11-base-depends.bb
index 036e513547..2eb3a36804 100644
--- a/packages/angstrom/angstrom-x11-base-depends.bb
+++ b/packages/angstrom/angstrom-x11-base-depends.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r33"
+PR = "r34"
ALLOW_EMPTY = "1"
XSERVER ?= "xserver-kdrive-fbdev"
@@ -9,7 +9,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
DEPENDS = "virtual/xserver"
RDEPENDS = "\
- virtual/libx11 \
${XSERVER} \
ttf-dejavu-sans \
ttf-dejavu-sans-mono \
diff --git a/packages/linux/ixp4xx-kernel/2.6.21/defconfig b/packages/linux/ixp4xx-kernel/2.6.21/defconfig
index 56474d512a..0fbb58a561 100644
--- a/packages/linux/ixp4xx-kernel/2.6.21/defconfig
+++ b/packages/linux/ixp4xx-kernel/2.6.21/defconfig
@@ -885,7 +885,7 @@ CONFIG_TUN=m
CONFIG_NET_ETHERNET=y
CONFIG_MII=m
CONFIG_IXP4XX_QMGR=m
-CONFIG_IXP4XX_NPE=m
+CONFIG_IXP4XX_NPE=y
CONFIG_IXP4XX_NPE_FW_LOAD=y
CONFIG_IXP4XX_NPE_FW_MTD=y
CONFIG_IXP4XX_MAC=m
diff --git a/packages/linux/ixp4xx-kernel_2.6.21.6.bb b/packages/linux/ixp4xx-kernel_2.6.21.6.bb
index ff90bcb3b3..b0ba8ba787 100644
--- a/packages/linux/ixp4xx-kernel_2.6.21.6.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.21.6.bb
@@ -6,7 +6,7 @@
# http://trac.nslu2-linux.org/kernel/
#
# The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "914"
+IXP4XX_KERNEL_SVN_REV = "915"
#
# The directory containing the patches to be applied is
# specified below
diff --git a/packages/pkgconfig/pkgconfig-native_0.22.bb b/packages/pkgconfig/pkgconfig-native_0.22.bb
index 5a5423058d..4481656d7a 100644
--- a/packages/pkgconfig/pkgconfig-native_0.22.bb
+++ b/packages/pkgconfig/pkgconfig-native_0.22.bb
@@ -2,6 +2,8 @@ SECTION = "console/utils"
require pkgconfig.inc
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}"
+DEFAULT_PREFERENCE = "-1"
+
S = "${WORKDIR}/pkg-config-${PV}/"
inherit native
DEPENDS = ""
@@ -11,4 +13,4 @@ do_configure() {
libtoolize --force
oe_runconf
}
- \ No newline at end of file
+
diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb
index d2281bca17..21f1b551f5 100644
--- a/packages/tasks/task-slugos.bb
+++ b/packages/tasks/task-slugos.bb
@@ -6,7 +6,7 @@
DESCRIPTION = "Task packages for the SlugOS distribution"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r12"
+PR = "r13"
PACKAGE_ARCH = "${MACHINE_ARCH}"
ALLOW_EMPTY = "1"
@@ -92,6 +92,9 @@ kernel-module-pata-artop \
# Add modules required for Network support
SLUGOS_STANDARD_RRECOMMENDS += "\
+kernel-module-mii \
+kernel-module-ixp4xx-mac \
+kernel-module-ixp4xx-qmgr \
kernel-module-via-velocity \
"
diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb
index 023f15cef3..7ac5b58345 100644
--- a/packages/xorg-lib/libx11_1.1.1.bb
+++ b/packages/xorg-lib/libx11_1.1.1.bb
@@ -1,13 +1,12 @@
require xorg-lib-common.inc
PE = "1"
-PR = "r2"
+PR = "r4"
DESCRIPTION = "Base X libs."
DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
libxcb libxdmcp xf86bigfontproto kbproto inputproto"
PROVIDES = "virtual/libx11"
-RPROVIDES = "virtual/libx11"
XORG_PN = "libX11"
@@ -20,9 +19,11 @@ FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
FILES_${PN}-xcb = "${libdir}/libX11-xcb.so.*"
do_compile() {
- (
- unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
- cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
- ) || exit 1
- oe_runmake
+ (
+ unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+ cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
+ cd ../../
+ ) || exit 1
+ oe_runmake
}
+
diff --git a/packages/xorg-lib/libx11_1.1.2.bb b/packages/xorg-lib/libx11_1.1.2.bb
index bab2277fd0..e6b0ec5d8b 100644
--- a/packages/xorg-lib/libx11_1.1.2.bb
+++ b/packages/xorg-lib/libx11_1.1.2.bb
@@ -5,17 +5,19 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
libxdmcp xf86bigfontproto kbproto inputproto"
PROVIDES = "virtual/libx11"
PE = "1"
+PR = "r1"
XORG_PN = "libX11"
EXTRA_OECONF += "--without-xcb"
do_compile() {
- (
- unset CC LD CXX CCLD
- oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
- )
- oe_runmake
+ (
+ unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+ cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
+ cd ../../
+ ) || exit 1
+ oe_runmake
}
FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
diff --git a/packages/xorg-lib/libx11_git.bb b/packages/xorg-lib/libx11_git.bb
index f2929624e8..422afc92e0 100644
--- a/packages/xorg-lib/libx11_git.bb
+++ b/packages/xorg-lib/libx11_git.bb
@@ -5,8 +5,7 @@ SECTION = "x11/libs"
LICENSE = "XFree86"
DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros"
PROVIDES = "virtual/libx11"
-RPROVIDES = "virtual/libx11"
-PR = "r1"
+PR = "r3"
FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
FILES_${PN}-locale += "${datadir}/X11/locale"
@@ -18,14 +17,17 @@ inherit autotools pkgconfig
EXTRA_OECONF="--enable-malloc0returnsnull"
+
do_compile() {
- (
- unset CC LD CXX CCLD
- oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
- )
- oe_runmake
+ (
+ unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+ cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
+ cd ../../
+ ) || exit 1
+ oe_runmake
}
+
do_stage() {
autotools_stage_all
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-15 04:16:22 +0000