Index: Makefile
===================================================================
--- Makefile (nonexistent)
+++ Makefile (revision 5)
@@ -0,0 +1,246 @@
+
+COMPONENT_TARGETS = $(HARDWARE_INTEL_PC32)
+COMPONENT_TARGETS += $(HARDWARE_INTEL_PC64)
+COMPONENT_TARGETS += $(HARDWARE_EBOX_3350DX2)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_ORANGE_PP2E)
+COMPONENT_TARGETS += $(HARDWARE_NANOPI_NEO)
+COMPONENT_TARGETS += $(HARDWARE_ORANGE_PP)
+COMPONENT_TARGETS += $(HARDWARE_ORANGE_PL2)
+COMPONENT_TARGETS += $(HARDWARE_WECHIP_TX6)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_POIN2)
+COMPONENT_TARGETS += $(HARDWARE_RK3328_CC)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_EDGE)
+COMPONENT_TARGETS += $(HARDWARE_LEEZ_P710)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM2)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OKMX6DL_C)
+COMPONENT_TARGETS += $(HARDWARE_OKMX6Q_C)
+COMPONENT_TARGETS += $(HARDWARE_BONE_BLACK)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BAIKAL_T1)
+COMPONENT_TARGETS += $(HARDWARE_BAIKAL_M1)
+COMPONENT_TARGETS += $(HARDWARE_S824L)
+COMPONENT_TARGETS += $(HARDWARE_VESNIN)
+COMPONENT_TARGETS += $(HARDWARE_S824L_LSB)
+COMPONENT_TARGETS += $(HARDWARE_VESNIN_LSB)
+COMPONENT_TARGETS += $(HARDWARE_TL2WK2)
+COMPONENT_TARGETS += $(HARDWARE_TL2SV2)
+COMPONENT_TARGETS += $(HARDWARE_TL2WK2_LSB)
+COMPONENT_TARGETS += $(HARDWARE_TL2SV2_LSB)
+COMPONENT_TARGETS += $(HARDWARE_SIFIVE_U740)
+
+
+NEED_ABS_PATH = true
+COMPONENT_IS_3PP = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES = sources/X.org/app/xinit
+
+REQUIRES = X11/X.org/lib/libX11/1.8.3
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version = 1.4.2
+tar_xz_archive = $(SRC_PACKAGE_PATH)/X.org/app/xinit/xinit-$(version).tar.xz
+SRC_ARCHIVE = $(tar_xz_archive)
+SRC_DIR = $(TARGET_BUILD_DIR)/xinit-$(version)
+src_dir_name = xinit-$(version)
+src_done = $(TARGET_BUILD_DIR)/.source_done
+
+readme_xmodmap = $(CURDIR)/doc/README.Xmodmap
+
+PATCHES = PATCHES
+
+build_dir = $(TARGET_BUILD_DIR)/build
+build_target = $(TARGET_BUILD_DIR)/.build_done
+install_target = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME = xinit
+XORG_PKG_VERSION = 1.4.2
+XORG_PKG_ARCH = $(PKGARCH)
+XORG_PKG_DISTRO_NAME = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION = $(DISTRO_VERSION)
+XORG_PKG_GROUP = $(PKG_GROUP)
+### |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION = scripts to start X11 servers
+XORG_PKG_URL = $(BUG_URL)
+XORG_PKG_LICENSE = custom
+XORG_PKG_DESCRIPTION_FILE = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature = $(call sign-name,$(pkg_archive))
+pkg_description = $(call desc-name,$(pkg_archive))
+products = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS = $(build_target)
+BUILD_TARGETS += $(install_target)
+
+PRODUCT_TARGETS = $(products)
+
+ROOTFS_TARGETS = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+CFLAGS += -Wno-discarded-qualifiers
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+ $(UNPACK_SRC_ARCHIVE)
+ $(APPLY_PATCHES)
+ @touch $@
+
+$(build_target): $(src_done)
+ @mkdir -p $(build_dir)
+ @cd $(build_dir) && \
+ $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+ --prefix=/usr \
+ --build=$(BUILD) \
+ --host=$(TARGET) \
+ $(extra_configure_switches)
+ # ======= Suppress cpp warnings =======
+ @( cd $(build_dir) ; \
+ sed -i 's,^\(RAWCPP = .*\),\1 -w,' Makefile ; \
+ )
+ @cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+ @touch $@
+
+$(install_target): $(build_target)
+ @mkdir -p $(XORG_PKG)
+ @cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+ # ======= Start X on vt7 and remove following code from startx: =======
+ # ======= ---------------------------------------------------- =======
+ # ======= # When starting the defaultserver start X on the current tty to avoid =======
+ # ======= # the startx session being seen as inactive: =======
+ # ======= # "https://bugzilla.redhat.com/show_bug.cgi?id=806491" =======
+ # ======= tty=$$(tty) =======
+ # ======= if expr "$$tty" : '/dev/tty[0-9][0-9]*$$' > /dev/null; then =======
+ # ======= tty_num=$${tty#/dev/tty} =======
+ # ======= vtarg="vt$$tty_num -keeptty" =======
+ # ======= fi
+ # =======
+ @( cd $(XORG_PKG)/usr/bin ; \
+ sed -i 's,^\(vtarg=\).*,\1"vt7",' startx ; \
+ sed -i '/# When starting the defaultserver start X on the current tty to avoid/,/^[ \t]*fi/d' startx ; \
+ )
+ # ======= Remove xinitrc: =======
+ # ======= -------------- =======
+ # ======= This should be selected by xwmconfig, and should not be included in the =======
+ # ======= package at all. Since this was included in the older package (and not as =======
+ # ======= "new") upgrading this will erase your xinitrc, and you'll have to run =======
+ # ======= xwmconfig again. Sorry about that, but it's better than having your =======
+ # ======= xinitrc overwritten with the TWM version... =======
+ # =======
+ @rm -f $(XORG_PKG)/etc/X11/xinit/xinitrc
+ # ======= Install Documentation =======
+ @cp -a $(readme_xmodmap) $(XORG_PKG)/etc/X11/xinit
+ @if [ -d $(XORG_PKG)/usr/share/man ]; then \
+ ( cd $(XORG_PKG)/usr/share/man ; \
+ for manpagedir in `find . -type d -name "man*"` ; do \
+ ( cd $$manpagedir ; \
+ for eachpage in `find . -type l -maxdepth 1` ; do \
+ ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+ rm $$eachpage ; \
+ done ; \
+ gzip -9 *.? ; \
+ ) \
+ done \
+ ) \
+ fi
+ @mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+ @cp -a $(SRC_DIR)/COPYING \
+ $(XORG_PKG)/usr/doc/$(src_dir_name)
+ @mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+ @( cd $(SRC_DIR) ; \
+ cp -a COPYING INSTALL README.md \
+ $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+ )
+ @( cd $(XORG_PKG)/usr/share/doc ; \
+ ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+ )
+ @( cd $(SRC_DIR) ; \
+ if [ -r ChangeLog ]; then \
+ DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+ cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+ touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+ fi \
+ )
+ # ======= Install the same to $(TARGET_DEST_DIR) =======
+ $(call install-into-devenv, $(XORG_PKG))
+ # ======= Strip binaries =======
+ @( cd $(XORG_PKG); \
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+ )
+ @touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+ @cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_certificate) : $(pkg_archive) ;
+$(pkg_signature) : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+ @cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+ @cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+ @$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+ @echo "pkgname=$(XORG_PKG_NAME)" > $(XORG_PKG)/.PKGINFO ; \
+ echo "pkgver=$(XORG_PKG_VERSION)" >> $(XORG_PKG)/.PKGINFO ; \
+ echo "arch=$(XORG_PKG_ARCH)" >> $(XORG_PKG)/.PKGINFO ; \
+ echo "distroname=$(XORG_PKG_DISTRO_NAME)" >> $(XORG_PKG)/.PKGINFO ; \
+ echo "distrover=$(XORG_PKG_DISTRO_VERSION)" >> $(XORG_PKG)/.PKGINFO ; \
+ echo "group=$(XORG_PKG_GROUP)" >> $(XORG_PKG)/.PKGINFO ; \
+ echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+ echo "url=$(XORG_PKG_URL)" >> $(XORG_PKG)/.PKGINFO ; \
+ echo "license=$(XORG_PKG_LICENSE)" >> $(XORG_PKG)/.PKGINFO
+ @$(PSEUDO) sh -c "cd $(XORG_PKG) && \
+ chown -R root:root . && \
+ $(MAKE_PACKAGE) -J --linkadd=yes $(GNUPG_OPTIONS) -m -d .. ."
Index: PATCHES
===================================================================
Index: doc/README.Xmodmap
===================================================================
--- doc/README.Xmodmap (nonexistent)
+++ doc/README.Xmodmap (revision 5)
@@ -0,0 +1,9 @@
+
+# In versions of XFree86 prior to 4.3.0, a .Xmodmap file was required in
+# this directory in order to make the backspace key function correctly.
+# This does not seem to be needed any longer, but if you notice problems
+# with the backspace key, you might want to try it.
+
+# Old .Xmodmap follows:
+
+keycode 22 = BackSpace
Index: doc
===================================================================
--- doc (nonexistent)
+++ doc (revision 5)
Property changes on: doc
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Index: xinit-pkg-description.in
===================================================================
--- xinit-pkg-description.in (nonexistent)
+++ xinit-pkg-description.in (revision 5)
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':'.
+
+ |-----handy-ruler------------------------------------------------------|
+xinit: xinit @VERSION@ (scripts to start X11 servers)
+xinit:
+xinit: xinit is part of X11.
+xinit:
+xinit: For more information about the X.Org Foundation (the providers
+xinit: of the X.Org implementation of the X Window System).
+xinit:
+xinit: See: http://www.x.org
+xinit:
+xinit:
+xinit:
Index: xinit-pkg-install.sh
===================================================================
--- xinit-pkg-install.sh (nonexistent)
+++ xinit-pkg-install.sh (revision 5)
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# Preserve new files
+install_file() {
+ NEW="$1"
+ OLD="`dirname $NEW`/`basename $NEW .new`"
+ # If there's no file by that name, mv it over:
+ if [ ! -r $OLD ]; then
+ mv $NEW $OLD
+ elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+ rm $NEW
+ fi
+ # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+
+# arg 1: the new package version
+pre_install() {
+ /bin/true
+}
+
+# arg 1: the new package version
+post_install() {
+ /bin/true
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+pre_update() {
+ /bin/true
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_update() {
+ post_install
+}
+
+# arg 1: the old package version
+pre_remove() {
+ /bin/true
+}
+
+# arg 1: the old package version
+post_remove() {
+ /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
Property changes on: xinit-pkg-install.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: .
===================================================================
--- . (nonexistent)
+++ . (revision 5)
Property changes on: .
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~