diff options
48 files changed, 1352 insertions, 487 deletions
@@ -12,11 +12,8 @@ - netbsd build - macos x build - openbsd build -- use kmod-template for external kernel modules - optimize iptables package (libdirs depending on choosen kernel features) - checksum for toolchain packages - network scripts for wireless client / ap - network scripts for pppoe -- fix platform zaurus -- test qemu etrax again - publish via trac+git diff --git a/mk/build.mk b/mk/build.mk index 4cdc7b6c7..c74e16045 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -101,8 +101,10 @@ image: switch: echo "Saving configuration for device: ${DEVICE}" cp .config .config.${DEVICE} + mv .cfg .cfg.${DEVICE} if [ -f .config.${DEV} ];then cp .config.${DEV} .config; \ cp .config.${DEV} .config.old; \ + mv .cfg.${DEV} .cfg; \ echo "Setting configuration to device: ${DEV}"; \ else echo "No old device config found";mv .config .config.bak;fi diff --git a/package/Config.in b/package/Config.in index 56e4a5f0c..96aeec3aa 100644 --- a/package/Config.in +++ b/package/Config.in @@ -12,6 +12,7 @@ source "package/cfgfs/Config.in" source "package/uclibc/Config.in" source "package/glibc/Config.in" source "package/libc/Config.in" +source "package/rpm/Config.in" endmenu menu "Bluetooth" @@ -141,7 +142,8 @@ source "package/comgt/Config.in" source "package/fbset/Config.in" source "package/file/Config.in" source "package/hdparm/Config.in" -source "package/usbutils/Config.in" # lsusb +source "package/usbutils/Config.in" +source "package/patch/Config.in" source "package/pciutils/Config.in" source "package/procps/Config.in" source "package/sispmctl/Config.in" @@ -350,6 +352,7 @@ source "package/gcc/Config.in" source "package/haserl/Config.in" source "package/jamvm/Config.in" source "package/lua/Config.in" +source "package/make/Config.in" source "package/microperl/Config.in" source "package/php/Config.in" source "package/ruby/Config.in" @@ -397,6 +400,8 @@ source "package/libid3tag/Config.in" source "package/jpeg/Config.in" # libjpeg source "package/lame/Config.in.lib" # libltdl source "package/mpfr/Config.in" +source "package/nspr/Config.in" +source "package/nss/Config.in" source "package/libtool/Config.in" # libltdl source "package/openldap/Config.in.lib" source "package/liblzo/Config.in" diff --git a/package/Depends.mk b/package/Depends.mk index 25d58ab58..9a45f5823 100644 --- a/package/Depends.mk +++ b/package/Depends.mk @@ -182,6 +182,8 @@ raddump-compile: openssl-compile libpcap-compile radiusclient-ng-compile: openssl-compile rarpd-compile: libnet-compile readline-compile: ncurses-compile +nss-compile: nspr-compile zlib-compile +rpm-compile: nss-compile libdb-compile rrdcollect-compile: rrdtool-compile rrdtool-compile: libxml2-compile cgilib-compile freetype-compile libart-compile libpng-compile rsync-compile: popt-compile diff --git a/package/Makefile b/package/Makefile index ad82261bf..68d6cc5f5 100644 --- a/package/Makefile +++ b/package/Makefile @@ -223,6 +223,7 @@ package-$(ADK_COMPILE_LUA) += lua package-$(ADK_COMPILE_LVM) += lvm package-$(ADK_PACKAGE_MACCHANGER) += macchanger package-$(ADK_PACKAGE_MADPLAY) += madplay +package-$(ADK_PACKAGE_MAKE) += make package-$(ADK_PACKAGE_MARADNS) += maradns package-$(ADK_PACKAGE_MGETTY) += mgetty package-$(ADK_PACKAGE_MC) += mc @@ -258,6 +259,7 @@ package-$(ADK_PACKAGE_NFS_UTILS) += nfs-utils package-$(ADK_PACKAGE_NFS_KERNEL_NFSD) += nfs-utils package-$(ADK_PACKAGE_NMAP) += nmap package-$(ADK_PACKAGE_NTPCLIENT) += ntpclient +package-$(ADK_PACKAGE_NSS) += nss package-$(ADK_PACKAGE_OBEXFTP) += obexftp package-$(ADK_PACKAGE_OLSRD) += olsrd package-$(ADK_COMPILE_OPENCDK) += opencdk @@ -278,6 +280,7 @@ package-$(ADK_PACKAGE_OWFS) += owfs package-$(ADK_PACKAGE_P910ND) += p910nd package-$(ADK_PACKAGE_PALANTIR) += palantir package-$(ADK_PACKAGE_PARPROUTED) += parprouted +package-$(ADK_PACKAGE_PATCH) += patch package-$(ADK_PACKAGE_PCIUTILS) += pciutils package-$(ADK_COMPILE_PCRE) += pcre package-$(ADK_COMPILE_PHP) += php @@ -307,6 +310,7 @@ package-$(ADK_PACKAGE_REAIM) += reaim package-$(ADK_PACKAGE_RENDERPROTO) += renderproto package-$(ADK_PACKAGE_RESOURCEPROTO) += resourceproto package-$(ADK_COMPILE_RP_PPPOE) += rp-pppoe +package-$(ADK_PACKAGE_RPM) += rpm package-$(ADK_PACKAGE_RRDCOLLECT) += rrdcollect package-$(ADK_COMPILE_RRDTOOL) += rrdtool package-$(ADK_PACKAGE_RUBY) += ruby diff --git a/package/base-files/extra/etc/profile b/package/base-files/extra/etc/profile index 55002b01f..798548a46 100644 --- a/package/base-files/extra/etc/profile +++ b/package/base-files/extra/etc/profile @@ -9,4 +9,4 @@ cat /etc/banner 2>&- [ -x /usr/bin/less ] || alias less=more [ -x /usr/bin/vim ] || alias vim=vi [ -x /usr/bin/arp ] || arp() { cat /proc/net/arp; } -[ -x /usr/bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 /lib/ld.so "$@"; } +[ -x /usr/bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 "$@"; } diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in index b41788be0..0426f7288 100644 --- a/package/busybox/config/Config.in +++ b/package/busybox/config/Config.in @@ -273,20 +273,20 @@ endmenu menu 'Build Options' -#config BUSYBOX_STATIC -# bool "Build BusyBox as a static binary (no shared libs)" -# default n -# help -# If you want to build a static BusyBox binary, which does not -# use or require any shared libraries, then enable this option. -# This can cause BusyBox to be considerably larger, so you should -# leave this option false unless you have a good reason (i.e. -# your target platform does not support shared libraries, or -# you are building an initrd which doesn't need anything but -# BusyBox, etc). -# -# Most people will leave this set to 'N'. -# +config BUSYBOX_STATIC + bool "Build BusyBox as a static binary (no shared libs)" + default n + help + If you want to build a static BusyBox binary, which does not + use or require any shared libraries, then enable this option. + This can cause BusyBox to be considerably larger, so you should + leave this option false unless you have a good reason (i.e. + your target platform does not support shared libraries, or + you are building an initrd which doesn't need anything but + BusyBox, etc). + + Most people will leave this set to 'N'. + #config BUSYBOX_PIE # bool "Build BusyBox as a position independent executable" # default n diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 9d14a2726..0cfa55f25 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dnsmasq -PKG_VERSION:= 2.47 +PKG_VERSION:= 2.49 PKG_RELEASE:= 1 -PKG_MD5SUM:= 4524081e56d0b935717d493e8e8d3e11 +PKG_MD5SUM:= 7ccc861d8a733474f9c0a0a127006ee9 PKG_DESCR:= A lightweight DNS and DHCP server PKG_SECTION:= net PKG_URL:= http://thekelleys.org.uk/dnsmasq diff --git a/package/libtirpc/patches/patch-src_svc_c b/package/libtirpc/patches/patch-src_svc_c new file mode 100644 index 000000000..48f84da1c --- /dev/null +++ b/package/libtirpc/patches/patch-src_svc_c @@ -0,0 +1,26 @@ +--- libtirpc-0.2.0.orig/src/svc.c 2009-05-28 21:25:26.000000000 +0200 ++++ libtirpc-0.2.0/src/svc.c 2009-06-27 10:18:05.491935140 +0200 +@@ -77,7 +77,9 @@ static struct svc_callout + + extern rwlock_t svc_lock; + extern rwlock_t svc_fd_lock; ++#ifdef HAVE_RPCSEC_GSS + extern struct svc_auth_ops svc_auth_gss_ops; ++#endif + + static struct svc_callout *svc_find (rpcprog_t, rpcvers_t, + struct svc_callout **, char *); +@@ -715,11 +717,13 @@ svc_getreq_common (fd) + SVC_DESTROY (xprt); + break; + } ++#ifdef HAVE_RPCSEC_GSS + else if ((xprt->xp_auth != NULL) && + (xprt->xp_auth->svc_ah_ops != &svc_auth_gss_ops)) + { + xprt->xp_auth = NULL; + } ++#endif + } + while (stat == XPRT_MOREREQS); + } diff --git a/package/make/Config.in b/package/make/Config.in new file mode 100644 index 000000000..6fe261e4c --- /dev/null +++ b/package/make/Config.in @@ -0,0 +1,6 @@ +config ADK_PACKAGE_MAKE + prompt "make.............................. GNU make" + tristate + default n + help + GNU make diff --git a/package/make/Makefile b/package/make/Makefile new file mode 100644 index 000000000..e8af2ed26 --- /dev/null +++ b/package/make/Makefile @@ -0,0 +1,27 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= make +PKG_VERSION:= 3.81 +PKG_RELEASE:= 1 +PKG_MD5SUM:= a4e9494ac6dc3f6b0c5ff75c5d52abba +PKG_DESCR:= GNU make +PKG_SECTION:= misc +PKG_URL:= http://www.gnu.org/software/make +PKG_SITES:= ${MASTER_SITE_GNU:=make/} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,MAKE,make,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE= gnu +BUILD_STYLE= auto +INSTALL_STYLE= auto + +post-install: + $(INSTALL_DIR) $(IDIR_MAKE)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/make $(IDIR_MAKE)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/mksh/Makefile b/package/mksh/Makefile index 5ef85559f..101fc91fc 100644 --- a/package/mksh/Makefile +++ b/package/mksh/Makefile @@ -4,10 +4,10 @@ include ${TOPDIR}/rules.mk PKG_NAME= mksh -PKG_VERSION= 38 +PKG_VERSION= 38c PKG_RELEASE= 1 -PKG_MD5SUM= e2fa1f50690abf763cc3e4d8e1612728 -PKG_DESCR:= popular MirOS KSH +PKG_MD5SUM= 692192a6468b5f5c5e559756f1851766 +PKG_DESCR:= MirBSD Korn Shell PKG_SECTION:= shells PKG_URL:= http://www.mirbsd.org PKG_SITES= ${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/} @@ -26,11 +26,11 @@ endif do-build: cd ${WRKBUILD} && CC='${TARGET_CC}' CFLAGS='${TCFLAGS}' \ CPPFLAGS='${TCPPFLAGS}' LDFLAGS='${TLDFLAGS}' \ - TARGET_OS=Linux ${BASH} ${WRKSRC}/Build.sh -Q -r + TARGET_OS=Linux ${BASH} ${WRKSRC}/Build.sh -Q -r -combine do-install: - install -d -m 0755 ${IDIR_MKSH}/bin - install -c -m 755 ${WRKBUILD}/mksh ${IDIR_MKSH}/bin/ - install -c -m 644 ${WRKSRC}/dot.mkshrc ${IDIR_MKSH}/.mkshrc + ${INSTALL_DIR} ${IDIR_MKSH}/bin ${IDIR_MKSH}/root + ${INSTALL_BIN} ${WRKBUILD}/mksh ${IDIR_MKSH}/bin/ + ${CP} ${WRKSRC}/dot.mkshrc ${IDIR_MKSH}/root/.mkshrc include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/mksh/files/mksh.conffiles b/package/mksh/files/mksh.conffiles index f139f0b55..dec964050 100644 --- a/package/mksh/files/mksh.conffiles +++ b/package/mksh/files/mksh.conffiles @@ -1 +1 @@ -/.mkshrc +/root/.mkshrc diff --git a/package/nspr/Config.in b/package/nspr/Config.in new file mode 100644 index 000000000..9cc1e9cbb --- /dev/null +++ b/package/nspr/Config.in @@ -0,0 +1,5 @@ +config ADK_PACKAGE_NSPR + prompt "nspr.............................. Red Hat package manager" + tristate + default n + help diff --git a/package/nspr/Makefile b/package/nspr/Makefile new file mode 100644 index 000000000..aa6a168bd --- /dev/null +++ b/package/nspr/Makefile @@ -0,0 +1,30 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= nspr +PKG_VERSION:= 4.8 +PKG_RELEASE:= 1 +PKG_MD5SUM:= e0916a72bcc6c427551ea262183fdb26 +PKG_DESCR:= NSPR library +PKG_SECTION:= libs +PKG_URL:= http://www.mozilla.org/projects/nspr/ +PKG_SITES:= https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.8/src/ + +WRKSRC= ${WRKDIST}/mozilla/nsprpub + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,NSPR,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_ENV+= HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" +CONFIGURE_STYLE= gnu +BUILD_STYLE= auto +INSTALL_STYLE= auto + +post-install: + $(INSTALL_DIR) $(IDIR_NSPR)/usr/lib + $(CP) $(WRKINST)/usr/lib/*.so* $(IDIR_NSPR)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/nss/Config.in b/package/nss/Config.in new file mode 100644 index 000000000..06c56929e --- /dev/null +++ b/package/nss/Config.in @@ -0,0 +1,5 @@ +config ADK_PACKAGE_NSS + prompt "nss............................... NSS library" + tristate + default n + help diff --git a/package/nss/Makefile b/package/nss/Makefile new file mode 100644 index 000000000..a837cd8d9 --- /dev/null +++ b/package/nss/Makefile @@ -0,0 +1,43 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= nss +PKG_VERSION:= 3.12.3 +PKG_RELEASE:= 1 +PKG_MD5SUM:= ecb7079ba4ebcf29b7716775384f1f18 +PKG_DESCR:= Network Security Services (NSS) library +PKG_SECTION:= libs +PKG_URL:= http://www.mozilla.org/projects/security/pki/nss/ +PKG_SITES:= ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_3_RTM/src/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +WRKSRC= ${WRKDIST}/mozilla/security/nss + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,NSS,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +ifeq ($(ADK_LINUX_64),y) +TCFLAGS+= -DUSE_64 +MAKE_FLAGS+= USE_64=1 +endif + +MAKE_FLAGS+= NATIVE_CC="${HOSTCC}" NATIVE_FLAGS="${HOSTCFLAGS}" NATIVE_LDFLAGS="${HOSTLDFLAGS}" +TCPPFLAGS+= -I${STAGING_DIR}/usr/include/nspr +TCFLAGS+= -I${STAGING_DIR}/usr/include/nspr +BUILD_STYLE= auto +INSTALL_STYLE= auto +MAKE_FLAGS+= SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist NSS_DISABLE_DBM=1 OS_TEST=${ARCH} \ + ARCHFLAG="${TCFLAGS} ${TCPPFLAGS}" +ALL_TARGET:= build_coreconf all +XAKE_FLAGS+= OS_TEST=${ARCH} NSS_DISABLE_DBM=1 + +post-install: + $(INSTALL_DIR) $(IDIR_NSS)/usr/lib + ${INSTALL_DATA} ${WRKDIST}/dist/lib/*.so $(IDIR_NSS)/usr/lib + ${INSTALL_DIR} ${STAGING_DIR}/usr/include/nss + ${INSTALL_DATA} ${WRKDIST}/mozilla/dist/public/nss/* ${STAGING_DIR}/usr/include/nss + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/nss/patches/patch-mozilla_security_coreconf_Linux_mk b/package/nss/patches/patch-mozilla_security_coreconf_Linux_mk new file mode 100644 index 000000000..cce23e2ee --- /dev/null +++ b/package/nss/patches/patch-mozilla_security_coreconf_Linux_mk @@ -0,0 +1,15 @@ +--- nss-3.12.3.orig/mozilla/security/coreconf/Linux.mk 2008-09-06 01:17:23.000000000 +0200 ++++ nss-3.12.3/mozilla/security/coreconf/Linux.mk 2009-06-24 19:11:27.470840369 +0200 +@@ -46,9 +46,9 @@ ifeq ($(USE_PTHREADS),1) + IMPL_STRATEGY = _PTH + endif + +-CC = gcc +-CCC = g++ +-RANLIB = ranlib ++CC ?= gcc ++CCC ?= g++ ++RANLIB ?= ranlib + + DEFAULT_COMPILER = gcc + diff --git a/package/nss/patches/patch-mozilla_security_coreconf_arch_mk b/package/nss/patches/patch-mozilla_security_coreconf_arch_mk new file mode 100644 index 000000000..1ebf69cc9 --- /dev/null +++ b/package/nss/patches/patch-mozilla_security_coreconf_arch_mk @@ -0,0 +1,11 @@ +--- nss-3.12.3.orig/mozilla/security/coreconf/arch.mk 2009-03-11 19:54:24.000000000 +0100 ++++ nss-3.12.3/mozilla/security/coreconf/arch.mk 2009-06-24 21:46:32.910214640 +0200 +@@ -329,7 +329,7 @@ endif + # IMPL_STRATEGY may be defined too. + # + +-OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ ++OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(LIBC_TAG).OBJ + + ifeq (,$(filter-out WIN%,$(OS_TARGET))) + ifndef BUILD_OPT diff --git a/package/nss/patches/patch-mozilla_security_coreconf_nsinstall_Makefile b/package/nss/patches/patch-mozilla_security_coreconf_nsinstall_Makefile new file mode 100644 index 000000000..db87f018b --- /dev/null +++ b/package/nss/patches/patch-mozilla_security_coreconf_nsinstall_Makefile @@ -0,0 +1,13 @@ +--- nss-3.12.3.orig/mozilla/security/coreconf/nsinstall/Makefile 2005-10-06 00:25:37.000000000 +0200 ++++ nss-3.12.3/mozilla/security/coreconf/nsinstall/Makefile 2009-06-24 19:48:52.858310011 +0200 +@@ -65,6 +65,10 @@ ifdef NATIVE_FLAGS + OS_CFLAGS=$(NATIVE_FLAGS) + endif + ++ifdef NATIVE_LDFLAGS ++LDFLAGS=$(NATIVE_LDFLAGS) ++endif ++ + include $(DEPTH)/coreconf/rules.mk + + # Redefine MAKE_OBJDIR for just this directory diff --git a/package/nss/patches/patch-mozilla_security_nss_cmd_shlibsign_sign_sh b/package/nss/patches/patch-mozilla_security_nss_cmd_shlibsign_sign_sh new file mode 100644 index 000000000..9c643dacf --- /dev/null +++ b/package/nss/patches/patch-mozilla_security_nss_cmd_shlibsign_sign_sh @@ -0,0 +1,11 @@ +--- nss-3.12.3.orig/mozilla/security/nss/cmd/shlibsign/sign.sh 2006-01-18 21:56:28.000000000 +0100 ++++ nss-3.12.3/mozilla/security/nss/cmd/shlibsign/sign.sh 2009-06-24 21:27:49.462838938 +0200 +@@ -53,6 +53,7 @@ OpenVMS) + ADDON_PATH=${1}/lib:${4}:$ADDON_PATH + export ADDON_PATH + echo ${2}/shlibsign -v -i ${5} +- ${2}/shlibsign -v -i ${5} ++ #disable for cross-compile ++ #${2}/shlibsign -v -i ${5} + ;; + esac diff --git a/package/patch/Config.in b/package/patch/Config.in new file mode 100644 index 000000000..651abdde9 --- /dev/null +++ b/package/patch/Config.in @@ -0,0 +1,6 @@ +config ADK_PACKAGE_PATCH + prompt "patch............................. patch" + tristate + default n + help + patch diff --git a/package/patch/Makefile b/package/patch/Makefile new file mode 100644 index 000000000..80a608f0d --- /dev/null +++ b/package/patch/Makefile @@ -0,0 +1,27 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= patch +PKG_VERSION:= 2.5.9 +PKG_RELEASE:= 1 +PKG_MD5SUM:= dacfb618082f8d3a2194601193cf8716 +PKG_DESCR:= GNU patch +PKG_SECTION:= misc +PKG_URL:= http://www.gnu.org/software/patch +PKG_SITES:= ${MASTER_SITE_GNU:=patch/} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,PATCH,patch,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE= gnu +BUILD_STYLE= auto +INSTALL_STYLE= auto + +post-install: + $(INSTALL_DIR) $(IDIR_PATCH)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/patch $(IDIR_PATCH)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/patch/patches/patch-Makefile_in b/package/patch/patches/patch-Makefile_in new file mode 100644 index 000000000..eab39b6e8 --- /dev/null +++ b/package/patch/patches/patch-Makefile_in @@ -0,0 +1,18 @@ +--- patch-2.5.9.orig/Makefile.in 2003-05-20 18:15:48.000000000 +0200 ++++ patch-2.5.9/Makefile.in 2009-06-13 22:52:33.487310060 +0200 +@@ -112,11 +112,11 @@ patch$(EXEEXT): $(OBJS) + $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) + + install:: all installdirs +- $(INSTALL_PROGRAM) patch$(EXEEXT) $(bindir)/$(patch_name)$(EXEEXT) +- -$(INSTALL_DATA) $(srcdir)/patch.man $(man1dir)/$(patch_name)$(man1ext) ++ $(INSTALL_PROGRAM) patch$(EXEEXT) $(DESTDIR)/$(bindir)/$(patch_name)$(EXEEXT) ++ -$(INSTALL_DATA) $(srcdir)/patch.man $(DESTDIR)/$(man1dir)/$(patch_name)$(man1ext) + +-installdirs:: +- $(SHELL) $(srcdir)/mkinstalldirs $(bindir) $(man1dir) ++installdirs: ++ $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)/$(bindir) $(DESTDIR)/$(man1dir) + + install-strip:: + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install diff --git a/package/rpm/Config.in b/package/rpm/Config.in new file mode 100644 index 000000000..c84884a08 --- /dev/null +++ b/package/rpm/Config.in @@ -0,0 +1,11 @@ +config ADK_PACKAGE_RPM + prompt "rpm............................... Red Hat package manager" + tristate + depends on ADK_CXX + select ADK_PACKAGE_NSS + select ADK_PACKAGE_NSPR + select ADK_PACKAGE_ZLIB + select ADK_PACKAGE_LIBDB + default n + help + Red Hat package manager diff --git a/package/rpm/Makefile b/package/rpm/Makefile new file mode 100644 index 000000000..c7cf91c97 --- /dev/null +++ b/package/rpm/Makefile @@ -0,0 +1,37 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= rpm +PKG_VERSION:= 4.7.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 74791d638c571ec79f06227d453a6a03 +PKG_DESCR:= GNU rpm +PKG_SECTION:= base +PKG_URL:= http://www.rpm.org +PKG_SITES:= http://rpm.org/releases/rpm-4.7.x/ + +DISTFILES:= ${PKG_NAME}-$(PKG_VERSION).tar.bz2 + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,RPM,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +TCPPFLAGS+= -I${STAGING_DIR}/usr/include/nspr \ + -I${STAGING_DIR}/usr/include/nss +CONFIGURE_STYLE:= gnu +CONFIGURE_ARGS:= --with-external-db \ + --without-lua +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_RPM)/usr/bin $(IDIR_RPM)/usr/lib + $(INSTALL_DIR) $(IDIR_RPM)/usr/lib/rpm + $(INSTALL_BIN) $(WRKINST)/bin/rpm $(IDIR_RPM)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/rpm* $(IDIR_RPM)/usr/bin + $(CP) $(WRKINST)/usr/lib/*.so* $(IDIR_RPM)/usr/lib + $(CP) $(WRKINST)/usr/lib/rpm/* $(IDIR_RPM)/usr/lib/rpm + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/rpm/patches/patch-config_guess b/package/rpm/patches/patch-config_guess new file mode 100644 index 000000000..b5ec8f21a --- /dev/null +++ b/package/rpm/patches/patch-config_guess @@ -0,0 +1,207 @@ +--- rpm-4.7.0.orig/config.guess 2008-08-30 00:27:10.000000000 +0200 ++++ rpm-4.7.0/config.guess 2009-06-11 17:31:39.670840385 +0200 +@@ -4,7 +4,7 @@ + # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 + # Free Software Foundation, Inc. + +-timestamp='2008-01-23' ++timestamp='2008-09-28' + + # This file is free softw |